|
|
@ -566,8 +566,14 @@ class ACMEAccount(object):
|
|
|
|
if m is not None:
|
|
|
|
if m is not None:
|
|
|
|
account_key_type = m.group(1).lower()
|
|
|
|
account_key_type = m.group(1).lower()
|
|
|
|
break
|
|
|
|
break
|
|
|
|
|
|
|
|
if account_key_type is None:
|
|
|
|
|
|
|
|
# This happens for example if openssl_privatekey created this key
|
|
|
|
|
|
|
|
# (as opposed to the OpenSSL binary). For now, we assume this is
|
|
|
|
|
|
|
|
# an RSA key.
|
|
|
|
|
|
|
|
# FIXME: add some kind of auto-detection
|
|
|
|
|
|
|
|
account_key_type = "rsa"
|
|
|
|
if account_key_type not in ("rsa", "ec"):
|
|
|
|
if account_key_type not in ("rsa", "ec"):
|
|
|
|
return 'unknown key type "%s" % account_key_type', {}
|
|
|
|
return 'unknown key type "%s"' % account_key_type, {}
|
|
|
|
|
|
|
|
|
|
|
|
openssl_keydump_cmd = [self._openssl_bin, account_key_type, "-in", key, "-noout", "-text"]
|
|
|
|
openssl_keydump_cmd = [self._openssl_bin, account_key_type, "-in", key, "-noout", "-text"]
|
|
|
|
dummy, out, dummy = self.module.run_command(openssl_keydump_cmd, check_rc=True)
|
|
|
|
dummy, out, dummy = self.module.run_command(openssl_keydump_cmd, check_rc=True)
|
|
|
|