diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2015-01-12 14:29:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-01-13 09:25:08 +0100 |
| commit | f067cca2bc20c86b110174c3fef04086a7f57b13 (patch) | |
| tree | ed313ce74e57bf0c04bb4bd1ecdf2032fd302fd3 | |
| parent | upstream commit (diff) | |
| download | openssh-f067cca2bc20c86b110174c3fef04086a7f57b13.tar.xz openssh-f067cca2bc20c86b110174c3fef04086a7f57b13.zip | |
upstream commit
allow WITH_OPENSSL w/o WITH_SSH1; ok djm@
| -rw-r--r-- | sshkey.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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. @@ -3510,10 +3510,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: @@ -3820,10 +3822,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: |