diff options
| -rw-r--r-- | paramiko/dsskey.py | 4 | ||||
| -rw-r--r-- | paramiko/ecdsakey.py | 4 | ||||
| -rw-r--r-- | paramiko/pkey.py | 8 | ||||
| -rw-r--r-- | paramiko/rsakey.py | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index 07feb790..f1bb330f 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -232,12 +232,12 @@ class DSSKey(PKey): pkformat, data = data # private key file contains: # DSAPrivateKey = { version = 0, p, q, g, y, x } - if pkformat == self.PRIVATE_KEY_FORMAT_ORIGINAL: + if pkformat == self._PRIVATE_KEY_FORMAT_ORIGINAL: try: keylist = BER(data).decode() except BERException as e: raise SSHException("Unable to parse key file: " + str(e)) - elif pkformat == self.PRIVATE_KEY_FORMAT_OPENSSH: + elif pkformat == self._PRIVATE_KEY_FORMAT_OPENSSH: keylist = self._uint32_cstruct_unpack(data, "iiiii") keylist = [0] + list(keylist) else: diff --git a/paramiko/ecdsakey.py b/paramiko/ecdsakey.py index 4c84a293..912795b6 100644 --- a/paramiko/ecdsakey.py +++ b/paramiko/ecdsakey.py @@ -284,14 +284,14 @@ class ECDSAKey(PKey): def _decode_key(self, data): pkformat, data = data - if pkformat == self.PRIVATE_KEY_FORMAT_ORIGINAL: + if pkformat == self._PRIVATE_KEY_FORMAT_ORIGINAL: try: key = serialization.load_der_private_key( data, password=None, backend=default_backend() ) except (ValueError, AssertionError) as e: raise SSHException(str(e)) - elif pkformat == self.PRIVATE_KEY_FORMAT_OPENSSH: + elif pkformat == self._PRIVATE_KEY_FORMAT_OPENSSH: curve, verkey, sigkey = self._uint32_cstruct_unpack(data, "sss") try: key = ec.derive_private_key(sigkey, curve, default_backend()) diff --git a/paramiko/pkey.py b/paramiko/pkey.py index c82cb718..32b696b2 100644 --- a/paramiko/pkey.py +++ b/paramiko/pkey.py @@ -73,8 +73,8 @@ class PKey(object): "mode": modes.CBC, }, } - PRIVATE_KEY_FORMAT_ORIGINAL = 1 - PRIVATE_KEY_FORMAT_OPENSSH = 2 + _PRIVATE_KEY_FORMAT_ORIGINAL = 1 + _PRIVATE_KEY_FORMAT_OPENSSH = 2 BEGIN_TAG = re.compile( r"^-{5}BEGIN (RSA|DSA|EC|OPENSSH) PRIVATE KEY-{5}\s*$" ) @@ -320,12 +320,12 @@ class PKey(object): if keytype == tag: data = self._read_private_key_old_format(lines, end, password) - pkformat = self.PRIVATE_KEY_FORMAT_ORIGINAL + pkformat = self._PRIVATE_KEY_FORMAT_ORIGINAL elif keytype == "OPENSSH": data = self._read_private_key_new_format( lines[start:end], password ) - pkformat = self.PRIVATE_KEY_FORMAT_OPENSSH + pkformat = self._PRIVATE_KEY_FORMAT_OPENSSH else: raise SSHException( "encountered {} key, expected {} key".format(keytype, tag) diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index 938660d5..f372a4cb 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -181,14 +181,14 @@ class RSAKey(PKey): def _decode_key(self, data): pkformat, data = data - if pkformat == self.PRIVATE_KEY_FORMAT_ORIGINAL: + if pkformat == self._PRIVATE_KEY_FORMAT_ORIGINAL: try: key = serialization.load_der_private_key( data, password=None, backend=default_backend() ) except ValueError as e: raise SSHException(str(e)) - elif pkformat == self.PRIVATE_KEY_FORMAT_OPENSSH: + elif pkformat == self._PRIVATE_KEY_FORMAT_OPENSSH: n, e, d, iqmp, q, p = self._uint32_cstruct_unpack(data, "iiiiii") public_numbers = rsa.RSAPublicNumbers(e=e, n=n) key = rsa.RSAPrivateNumbers( |