[openssh-commits] [openssh] 04/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ecc35893715f969e98fee118481f404772de4132
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Feb 17 02:31:14 2017 +0000

    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
---
 sshkey.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sshkey.c b/sshkey.c
index 31710e5..85fd1bd 100644
--- a/sshkey.c
+++ b/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.
@@ -89,7 +89,9 @@ static const struct keytype keytypes[] = {
 	{ "ssh-ed25519-cert-v01 at 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 },

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.