diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-05 18:19:07 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-05 18:19:07 -0700 |
| commit | 85c24776774458ea9782272552570966fd3a4c45 (patch) | |
| tree | 6abd8de2aea9d6011f1c78699f7fb002e3ce683d /paramiko/ed25519key.py | |
| parent | c4041f37db59ee71dfa77a2f34cd5ff65e00a6b6 (diff) | |
| parent | 5fed4c1f4b67b7337de4c9a01bd8e3c23e6a529f (diff) | |
| download | paramiko-85c24776774458ea9782272552570966fd3a4c45.tar.gz | |
Merge branch 'master' into 1026-int
Diffstat (limited to 'paramiko/ed25519key.py')
| -rw-r--r-- | paramiko/ed25519key.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/paramiko/ed25519key.py b/paramiko/ed25519key.py index 0fbc2f67..aa5e885d 100644 --- a/paramiko/ed25519key.py +++ b/paramiko/ed25519key.py @@ -51,8 +51,11 @@ class Ed25519Key(PKey): if msg is None and data is not None: msg = Message(data) if msg is not None: - if msg.get_text() != "ssh-ed25519": - raise SSHException("Invalid key") + self._check_type_and_load_cert( + msg=msg, + key_type="ssh-ed25519", + cert_type="ssh-ed25519-cert-v01@openssh.com", + ) verifying_key = nacl.signing.VerifyKey(msg.get_binary()) elif filename is not None: with open(filename, "r") as f: |