aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Stöneberg <oliverst@online.de>2011-05-02 09:25:12 -0700
committerAndreas Schneider <asn@cryptomilk.org>2011-05-17 20:57:58 +0200
commitda8356b477fc94a18b8098f021a25d7e24ee79de (patch)
treec6641d5feca49f80a9325253a34a89d2db4246f6
parente5fb20c17b3412cc2fcad60c8fba81fa7d9a2bc8 (diff)
downloadlibssh-da8356b477fc94a18b8098f021a25d7e24ee79de.tar.gz
libssh-da8356b477fc94a18b8098f021a25d7e24ee79de.tar.xz
libssh-da8356b477fc94a18b8098f021a25d7e24ee79de.zip
Use BIO* in _privatekey_from_file [Oliver Stöneberg]
_privatekey_from_file: moved FILE* into HAVE_LIBGCRYPT code / added missing #ifdef's to default case of switch [Oliver Stöneberg]
-rw-r--r--src/keyfiles.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/keyfiles.c b/src/keyfiles.c
index 1f4cd888..d0f30076 100644
--- a/src/keyfiles.c
+++ b/src/keyfiles.c
@@ -890,8 +890,6 @@ ssh_private_key _privatekey_from_file(void *session, const char *filename,
ssh_set_error(session, SSH_FATAL,
"Parsing private key %s: %s",
filename, ERR_error_string(ERR_get_error(), NULL));
-#else
- {
#endif
return NULL;
}
@@ -913,8 +911,6 @@ ssh_private_key _privatekey_from_file(void *session, const char *filename,
ssh_set_error(session, SSH_FATAL,
"Parsing private key %s: %s",
filename, ERR_error_string(ERR_get_error(), NULL));
-#else
- {
#endif
return NULL;
}