upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 06:42:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixing some left out remote changes

Browse source
This commit is contained in:
Osiris Inferi 2016-06-16 13:04:30 +02:00
parent 86ac394dae
commit 87b71d562a
No known key found for this signature in database
GPG key ID: 590297AD5FAE2134
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
certbot/crypto_util.py
View file

@ -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)

8
certbot/tests/client_test.py
View file

@ -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"]