summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sshkey.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sshkey.c b/sshkey.c
index 3a90217dd..884643e59 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.c,v 1.8 2015/01/08 10:14:08 djm Exp $ */ 1/* $OpenBSD: sshkey.c,v 1.9 2015/01/12 13:29:27 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved. 4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -3510,10 +3510,12 @@ sshkey_private_to_fileblob(struct sshkey *key, struct sshbuf *blob,
3510 int force_new_format, const char *new_format_cipher, int new_format_rounds) 3510 int force_new_format, const char *new_format_cipher, int new_format_rounds)
3511{ 3511{
3512 switch (key->type) { 3512 switch (key->type) {
3513#ifdef WITH_OPENSSL 3513#ifdef WITH_SSH1
3514 case KEY_RSA1: 3514 case KEY_RSA1:
3515 return sshkey_private_rsa1_to_blob(key, blob, 3515 return sshkey_private_rsa1_to_blob(key, blob,
3516 passphrase, comment); 3516 passphrase, comment);
3517#endif /* WITH_SSH1 */
3518#ifdef WITH_OPENSSL
3517 case KEY_DSA: 3519 case KEY_DSA:
3518 case KEY_ECDSA: 3520 case KEY_ECDSA:
3519 case KEY_RSA: 3521 case KEY_RSA:
@@ -3820,10 +3822,12 @@ sshkey_parse_private_fileblob_type(struct sshbuf *blob, int type,
3820 *commentp = NULL; 3822 *commentp = NULL;
3821 3823
3822 switch (type) { 3824 switch (type) {
3823#ifdef WITH_OPENSSL 3825#ifdef WITH_SSH1
3824 case KEY_RSA1: 3826 case KEY_RSA1:
3825 return sshkey_parse_private_rsa1(blob, passphrase, 3827 return sshkey_parse_private_rsa1(blob, passphrase,
3826 keyp, commentp); 3828 keyp, commentp);
3829#endif /* WITH_SSH1 */
3830#ifdef WITH_OPENSSL
3827 case KEY_DSA: 3831 case KEY_DSA:
3828 case KEY_ECDSA: 3832 case KEY_ECDSA:
3829 case KEY_RSA: 3833 case KEY_RSA: