diff options
| author | Jared Hobbs <jared@pyhacker.com> | 2018-11-27 17:22:59 -0700 |
|---|---|---|
| committer | Jared Hobbs <jared@pyhacker.com> | 2018-11-27 17:22:59 -0700 |
| commit | eff204faf5624c51b7ac96b9b93e4ce9622f853a (patch) | |
| tree | 8cfd853320df944d7fd9ca7b272c22079af277e7 /paramiko/ed25519key.py | |
| parent | 6656f5453cedf9d9e497a6f49a25f8fc683b8551 (diff) | |
| download | paramiko-eff204faf5624c51b7ac96b9b93e4ce9622f853a.tar.gz | |
add support for new OpenSSH private key format
This work is based off the work done in https://github.com/paramiko/paramiko/pull/618
Diffstat (limited to 'paramiko/ed25519key.py')
| -rw-r--r-- | paramiko/ed25519key.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/ed25519key.py b/paramiko/ed25519key.py index 68ada224..3bd0ff10 100644 --- a/paramiko/ed25519key.py +++ b/paramiko/ed25519key.py @@ -73,9 +73,9 @@ class Ed25519Key(PKey): verifying_key = nacl.signing.VerifyKey(msg.get_binary()) elif filename is not None: with open(filename, "r") as f: - data = self._read_private_key("OPENSSH", f) + pkformat, data = self._read_private_key("OPENSSH", f) elif file_obj is not None: - data = self._read_private_key("OPENSSH", file_obj) + pkformat, data = self._read_private_key("OPENSSH", file_obj) if filename or file_obj: signing_key = self._parse_signing_key_data(data, password) |