diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2015-01-12 13:29:28 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2015-01-12 13:29:28 +0000 |
| commit | 015a0d9eb95e33584688f3348673ad3c7b45c047 (patch) | |
| tree | 478bbb1b79c9b938950644f6a27e16fe1a6a0c6c /usr.bin/ssh | |
| parent | ffb135dc186225f139411e07894c004ee023d66c (diff) | |
allow WITH_OPENSSL w/o WITH_SSH1; ok djm@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sshkey.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshkey.c b/usr.bin/ssh/sshkey.c index 55b9352ed3a..4421bff08f7 100644 --- 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: |