From 87b71d562ae3f02f2971bab566bf4d74bf891411 Mon Sep 17 00:00:00 2001 From: Osiris Inferi Date: Thu, 16 Jun 2016 13:04:30 +0200 Subject: [PATCH] Fixing some left out remote changes --- certbot/crypto_util.py | 2 +- certbot/tests/client_test.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/certbot/crypto_util.py b/certbot/crypto_util.py index 4e3854de0..72797c615 100644 --- a/certbot/crypto_util.py +++ b/certbot/crypto_util.py @@ -50,7 +50,7 @@ def save_key(key_pem, key_dir, keyname="key-certbot.pem"): config.strict_permissions) key_f, key_path = util.unique_file(os.path.join(key_dir, keyname), 0o600) with key_f: - logger.info("Generating key (%d bits): %s", key_size, key_path) + logger.info("Saving key to: %s", key_path) key_f.write(key_pem) return util.Key(key_path, key_pem) diff --git a/certbot/tests/client_test.py b/certbot/tests/client_test.py index 4e31e7f0e..e7fb1b120 100644 --- a/certbot/tests/client_test.py +++ b/certbot/tests/client_test.py @@ -176,7 +176,7 @@ class ClientTest(unittest.TestCase): def test_obtain_certificate_rsa(self, mock_crypto_util): self._mock_obtain_certificate() - csr = le_util.CSR(form="der", file=None, data=CSR_SAN) + csr = util.CSR(form="der", file=None, data=CSR_SAN) mock_crypto_util.init_save_csr.return_value = csr mock_crypto_util.save_key.return_value = mock.sentinel.key domains = ["example.com", "www.example.com"] @@ -212,7 +212,7 @@ class ClientTest(unittest.TestCase): self.config.key_types = "ecdsa" self.config.ecdsa_curve = "p-256" - csr = le_util.CSR(form="der", file=None, data=CSR_SAN) + csr = util.CSR(form="der", file=None, data=CSR_SAN) mock_crypto_util.init_save_csr.return_value = csr mock_crypto_util.save_key.return_value = mock.sentinel.key domains = ["example.com", "www.example.com"] @@ -284,7 +284,7 @@ class ClientTest(unittest.TestCase): self._mock_obtain_certificate() self.config.key_types = "ecdsa rsa" - csr = le_util.CSR(form="der", file=None, data=CSR_SAN) + csr = util.CSR(form="der", file=None, data=CSR_SAN) mock_crypto_util.init_save_csr.return_value = csr mock_crypto_util.save_key.return_value = mock.sentinel.key domains = ["example.com", "www.example.com"] @@ -312,7 +312,7 @@ class ClientTest(unittest.TestCase): self._mock_obtain_certificate() self.config.key_types = "nonexistingalgo" - csr = le_util.CSR(form="der", file=None, data=CSR_SAN) + csr = util.CSR(form="der", file=None, data=CSR_SAN) mock_crypto_util.init_save_csr.return_value = csr mock_crypto_util.save_key.return_value = mock.sentinel.key domains = ["example.com", "www.example.com"]