allow WITH_OPENSSL w/o WITH_SSH1; ok djm@

diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c
index 55b9352..4421bff 100644 (file)
--- a/usr.bin/ssh/sshkey.c
+++ b/usr.bin/ssh/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.8 2015/01/08 10:14:08 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.9 2015/01/12 13:29:27 markus Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -3454,10 +3454,12 @@ sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
     int force_new_format, const char *new_format_cipher, int new_format_rounds)
 {
        switch (key->type) {
-#ifdef WITH_OPENSSL
+#ifdef WITH_SSH1
        case KEY_RSA1:
                return sshkey_private_rsa1_to_blob(key, blob,
                    passphrase, comment);
+#endif /* WITH_SSH1 */
+#ifdef WITH_OPENSSL
        case KEY_DSA:
        case KEY_ECDSA:
        case KEY_RSA:
@@ -3762,10 +3764,12 @@ sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
                *commentp = NULL;
 
        switch (type) {
-#ifdef WITH_OPENSSL
+#ifdef WITH_SSH1
        case KEY_RSA1:
                return sshkey_parse_private_rsa1(blob, passphrase,
                    keyp, commentp);
+#endif /* WITH_SSH1 */
+#ifdef WITH_OPENSSL
        case KEY_DSA:
        case KEY_ECDSA:
        case KEY_RSA: