summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-04-30 23:15:04 +0000
committerDamien Miller <djm@mindrot.org>2017-05-01 10:04:58 +1000
commitcdccebdf85204bf7542b7fcc1aa2ea3f36661833 (patch)
treefd07acdcdebd7da5dc027e58261a446a807466ba /sshkey.c
parent97f4d3083b036ce3e68d6346a6140a22123d5864 (diff)
upstream commit
remove SSHv1 ciphers; ok markus@ Upstream-ID: e5ebc5e540d7f23a8c1266db1839794d4d177890
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sshkey.c b/sshkey.c
index 045f1284..1741d9b1 100644
--- a/sshkey.c
+++ b/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.
@@ -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;
}