From 77a637b7f084f35db57c014e4b0e22344bfcfed2 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Thu, 12 Feb 2015 15:03:58 +0000
Subject: [PATCH] Fix save_certificate (Certificate.chain is decoded already).

---
 letsencrypt/client/client.py                 |  2 +-
 letsencrypt/client/crypto_util.py            |  8 --------
 letsencrypt/client/tests/crypto_util_test.py | 12 ------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index fa04a7ffb..0899c9702 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -160,7 +160,7 @@ class Client(object):
         if certificate_msg.chain:
             chain_fd, chain_fn = le_util.unique_file(chain_path, 0o644)
             for cert in certificate_msg.chain:
-                chain_fd.write(crypto_util.b64_cert_to_pem(cert))
+                chain_fd.write(cert.to_pem())
             chain_fd.close()
 
             logging.info("Cert chain written to %s", chain_fn)
diff --git a/letsencrypt/client/crypto_util.py b/letsencrypt/client/crypto_util.py
index 7dc8cee52..e2c4965fe 100644
--- a/letsencrypt/client/crypto_util.py
+++ b/letsencrypt/client/crypto_util.py
@@ -7,8 +7,6 @@ import Crypto.Signature.PKCS1_v1_5
 
 import M2Crypto
 
-from letsencrypt.acme import jose
-
 
 def make_csr(key_str, domains):
     """Generate a CSR.
@@ -191,9 +189,3 @@ def get_cert_info(filename):
         "serial": cert.get_serial_number(),
         "pub_key": "RSA " + str(cert.get_pubkey().size() * 8),
     }
-
-
-def b64_cert_to_pem(b64_der_cert):
-    """Convert JOSE Base-64 encoded DER cert to PEM."""
-    return M2Crypto.X509.load_cert_der_string(
-        jose.b64decode(b64_der_cert)).as_pem()
diff --git a/letsencrypt/client/tests/crypto_util_test.py b/letsencrypt/client/tests/crypto_util_test.py
index 4b2be41bf..cb047281f 100644
--- a/letsencrypt/client/tests/crypto_util_test.py
+++ b/letsencrypt/client/tests/crypto_util_test.py
@@ -133,17 +133,5 @@ class GetCertInfoTest(unittest.TestCase):
         self._call('cert-san.pem')
 
 
-class B64CertToPEMTest(unittest.TestCase):
-    # pylint: disable=too-few-public-methods
-    """Tests for letsencrypt.client.crypto_util.b64_cert_to_pem."""
-
-    def test_it(self):
-        from letsencrypt.client.crypto_util import b64_cert_to_pem
-        self.assertEqual(
-            b64_cert_to_pem(pkg_resources.resource_string(
-                __name__, 'testdata/cert.b64jose')),
-            pkg_resources.resource_string(__name__, 'testdata/cert.pem'))
-
-
 if __name__ == '__main__':
     unittest.main()