diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-05-01 01:15:04 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 02:04:58 +0200 |
| commit | cdccebdf85204bf7542b7fcc1aa2ea3f36661833 (patch) | |
| tree | fd07acdcdebd7da5dc027e58261a446a807466ba /sshkey.c | |
| parent | upstream commit (diff) | |
| download | openssh-cdccebdf85204bf7542b7fcc1aa2ea3f36661833.tar.xz openssh-cdccebdf85204bf7542b7fcc1aa2ea3f36661833.zip | |
upstream commit
remove SSHv1 ciphers; ok markus@
Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890
Diffstat (limited to 'sshkey.c')
| -rw-r--r-- | sshkey.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -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. @@ -2971,12 +2971,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; } |