diff options
| author |   djm <djm@openbsd.org> | 2017-04-30 23:15:04 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-04-30 23:15:04 +0000 |
| commit | 76745bed426e9df44bd9ddcc7c5d7d5c29b538b5 (patch) | |
| tree | 2e3929ea5b570ad7ad30b64eef75f54418561f95 /usr.bin/ssh/sshkey.c | |
| parent | remove compat20/compat13/compat15 variables (diff) | |
| download | wireguard-openbsd-76745bed426e9df44bd9ddcc7c5d7d5c29b538b5.tar.xz wireguard-openbsd-76745bed426e9df44bd9ddcc7c5d7d5c29b538b5.zip | |
remove SSHv1 ciphers; ok markus@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index f30178f4b23..ac35bdd4ad7 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.46 2017/04/30 23:10:43 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.47 2017/04/30 23:15:04 djm Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -2921,12 +2921,8 @@ sshkey_private_to_blob2(const struct sshkey *prv, struct sshbuf *blob, kdfname = "none"; } else if (ciphername == NULL) ciphername = DEFAULT_CIPHERNAME; - else if (cipher_number(ciphername) != SSH_CIPHER_SSH2) { - r = SSH_ERR_INVALID_ARGUMENT; - goto out; - } if ((cipher = cipher_by_name(ciphername)) == NULL) { - r = SSH_ERR_INTERNAL_ERROR; + r = SSH_ERR_INVALID_ARGUMENT; goto out; } |