diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-02-17 02:31:14 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-02-17 14:52:24 +1100 |
commit | ecc35893715f969e98fee118481f404772de4132 (patch) | |
tree | f644836ab8ef393cd5a1d1ea149b422c3047a392 /sshkey.c | |
parent | 10577c6d96a55b877a960b2d0b75edef1b9945af (diff) |
upstream commit
ifdef out "rsa1" from the list of supported keytypes when
compiled without SSH1 support. Found by kdunlop at guralp.com, ok djm@
Upstream-ID: cea93a26433d235bb1d64b1d990f19a9c160a70f
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.42 2017/02/10 04:34:50 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.43 2017/02/17 02:31:14 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. |
@@ -89,7 +89,9 @@ static const struct keytype keytypes[] = { | |||
89 | { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT", | 89 | { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT", |
90 | KEY_ED25519_CERT, 0, 1, 0 }, | 90 | KEY_ED25519_CERT, 0, 1, 0 }, |
91 | #ifdef WITH_OPENSSL | 91 | #ifdef WITH_OPENSSL |
92 | # ifdef WITH_SSH1 | ||
92 | { NULL, "RSA1", KEY_RSA1, 0, 0, 0 }, | 93 | { NULL, "RSA1", KEY_RSA1, 0, 0, 0 }, |
94 | # endif | ||
93 | { "ssh-rsa", "RSA", KEY_RSA, 0, 0, 0 }, | 95 | { "ssh-rsa", "RSA", KEY_RSA, 0, 0, 0 }, |
94 | { "rsa-sha2-256", "RSA", KEY_RSA, 0, 0, 1 }, | 96 | { "rsa-sha2-256", "RSA", KEY_RSA, 0, 0, 1 }, |
95 | { "rsa-sha2-512", "RSA", KEY_RSA, 0, 0, 1 }, | 97 | { "rsa-sha2-512", "RSA", KEY_RSA, 0, 0, 1 }, |