From 2adcce6b3d6386a087ef76462d8a0c221ceb30b5 Mon Sep 17 00:00:00 2001
From: Brad Warren <bradmw@umich.edu>
Date: Sat, 17 Oct 2015 13:53:22 -0700
Subject: [PATCH] Delete code in storage.py

---
 letsencrypt/storage.py            | 48 ++-----------------------------
 letsencrypt/tests/renewer_test.py | 21 --------------
 2 files changed, 3 insertions(+), 66 deletions(-)

diff --git a/letsencrypt/storage.py b/letsencrypt/storage.py
index 8a0f4829e..12411ffb4 100644
--- a/letsencrypt/storage.py
+++ b/letsencrypt/storage.py
@@ -5,10 +5,8 @@ import re
 import time
 
 import configobj
-import OpenSSL
 import parsedatetime
 import pytz
-import pyrfc3339
 
 from letsencrypt import constants
 from letsencrypt import crypto_util
@@ -381,47 +379,6 @@ class RenewableCert(object):  # pylint: disable=too-many-instance-attributes
         for kind in ALL_FOUR:
             self._update_link_to(kind, version)
 
-    def _notafterbefore(self, method, version):
-        """Internal helper function for finding notbefore/notafter."""
-        if version is None:
-            target = self.current_target("cert")
-        else:
-            target = self.version("cert", version)
-        pem = open(target).read()
-        x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
-                                               pem)
-        i = method(x509)
-        return pyrfc3339.parse(i[0:4] + "-" + i[4:6] + "-" + i[6:8] + "T" +
-                               i[8:10] + ":" + i[10:12] + ":" + i[12:])
-
-    def notbefore(self, version=None):
-        """When does the specified cert version start being valid?
-
-        (If no version is specified, use the current version.)
-
-        :param int version: the desired version number
-
-        :returns: the notBefore value from the specified cert version in
-            this lineage
-        :rtype: :class:`datetime.datetime`
-
-        """
-        return self._notafterbefore(lambda x509: x509.get_notBefore(), version)
-
-    def notafter(self, version=None):
-        """When does the specified cert version stop being valid?
-
-        (If no version is specified, use the current version.)
-
-        :param int version: the desired version number
-
-        :returns: the notAfter value from the specified cert version in
-            this lineage
-        :rtype: :class:`datetime.datetime`
-
-        """
-        return self._notafterbefore(lambda x509: x509.get_notAfter(), version)
-
     def names(self, version=None):
         """What are the subject names of this certificate?
 
@@ -470,7 +427,7 @@ class RenewableCert(object):  # pylint: disable=too-many-instance-attributes
                 interval = self.configuration.get("deploy_before_expiry",
                                                   "5 days")
                 autodeploy_interval = parse_time_interval(interval)
-                expiry = self.notafter()
+                expiry = crypto_util.notAfter(self.current_target("cert"))
                 now = datetime.datetime.utcnow().replace(tzinfo=pytz.UTC)
                 remaining = expiry - now
                 if remaining < autodeploy_interval:
@@ -537,7 +494,8 @@ class RenewableCert(object):  # pylint: disable=too-many-instance-attributes
             # Renewals on the basis of expiry time
             interval = self.configuration.get("renew_before_expiry", "10 days")
             autorenew_interval = parse_time_interval(interval)
-            expiry = self.notafter(self.latest_common_version())
+            expiry = crypto_util.notAfter(self.version(
+                "cert", self.latest_common_version()))
             now = datetime.datetime.utcnow().replace(tzinfo=pytz.UTC)
             remaining = expiry - now
             if remaining < autorenew_interval:
diff --git a/letsencrypt/tests/renewer_test.py b/letsencrypt/tests/renewer_test.py
index 1e434b79e..297bbd1b1 100644
--- a/letsencrypt/tests/renewer_test.py
+++ b/letsencrypt/tests/renewer_test.py
@@ -7,7 +7,6 @@ import unittest
 
 import configobj
 import mock
-import pytz
 
 from letsencrypt import configuration
 from letsencrypt import errors
@@ -349,26 +348,6 @@ class RenewableCertTests(BaseRenewableCertTest):
         self.assertEqual(self.test_rc.names(12),
                          ["example.com", "www.example.com"])
 
-    def _test_notafterbefore(self, function, timestamp):
-        test_cert = test_util.load_vector("cert.pem")
-        os.symlink(os.path.join("..", "..", "archive", "example.org",
-                                "cert12.pem"), self.test_rc.cert)
-        with open(self.test_rc.cert, "w") as f:
-            f.write(test_cert)
-        desired_time = datetime.datetime.utcfromtimestamp(timestamp)
-        desired_time = desired_time.replace(tzinfo=pytz.UTC)
-        for result in (function(), function(12)):
-            self.assertEqual(result, desired_time)
-            self.assertEqual(result.utcoffset(), datetime.timedelta(0))
-
-    def test_notbefore(self):
-        self._test_notafterbefore(self.test_rc.notbefore, 1418337285)
-        # 2014-12-11 22:34:45+00:00 = Unix time 1418337285
-
-    def test_notafter(self):
-        self._test_notafterbefore(self.test_rc.notafter, 1418942085)
-        # 2014-12-18 22:34:45+00:00 = Unix time 1418942085
-
     @mock.patch("letsencrypt.storage.datetime")
     def test_time_interval_judgments(self, mock_datetime):
         """Test should_autodeploy() and should_autorenew() on the basis