diff options
| author |   dtucker <dtucker@openbsd.org> | 2017-02-17 02:31:14 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2017-02-17 02:31:14 +0000 |
| commit | 5637c3772d8e2f135b0db6de16e9c2264af3119b (patch) | |
| tree | b3b82a9e5c601590624cd262a8cb7a8f796b9eb0 /usr.bin/ssh/sshkey.c | |
| parent | For ProxyJump/-J, surround host name with brackets to allow (diff) | |
| download | wireguard-openbsd-5637c3772d8e2f135b0db6de16e9c2264af3119b.tar.xz wireguard-openbsd-5637c3772d8e2f135b0db6de16e9c2264af3119b.zip | |
ifdef out "rsa1" from the list of supported keytypes when compiled without
SSH1 support. Found by kdunlop at guralp.com, ok djm@
Diffstat (limited to 'usr.bin/ssh/sshkey.c')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 982c8ec6302..f28cd4f5670 100644 --- a/usr.bin/ssh/sshkey.c +++ b/usr.bin/ssh/sshkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshkey.c,v 1.42 2017/02/10 04:34:50 djm Exp $ */ +/* $OpenBSD: sshkey.c,v 1.43 2017/02/17 02:31:14 dtucker Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2008 Alexander von Gernler. All rights reserved. @@ -85,7 +85,9 @@ static const struct keytype keytypes[] = { { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT", KEY_ED25519_CERT, 0, 1, 0 }, #ifdef WITH_OPENSSL +# ifdef WITH_SSH1 { NULL, "RSA1", KEY_RSA1, 0, 0, 0 }, +# endif { "ssh-rsa", "RSA", KEY_RSA, 0, 0, 0 }, { "rsa-sha2-256", "RSA", KEY_RSA, 0, 0, 1 }, { "rsa-sha2-512", "RSA", KEY_RSA, 0, 0, 1 }, |