summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-05-19 19:47:29 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-05-19 19:47:29 +0200
commit2624e603d4fc47d1bcf16cc1374628fe0b10f555 (patch)
treee912579d86e7735c5bbcf1e2a2b2d75a83e7ff71 /src
parentfd61eda16d081f30fdca97c97d71381d255d46d4 (diff)
downloadlibssh-2624e603d4fc47d1bcf16cc1374628fe0b10f555.tar.gz
libssh-2624e603d4fc47d1bcf16cc1374628fe0b10f555.tar.xz
libssh-2624e603d4fc47d1bcf16cc1374628fe0b10f555.zip
Revert "Use BIO* in _privatekey_from_file [Oliver Stöneberg]"
This reverts commit da8356b477fc94a18b8098f021a25d7e24ee79de.
Diffstat (limited to 'src')
-rw-r--r--src/keyfiles.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/keyfiles.c b/src/keyfiles.c
index 77910ed0..e160f71f 100644
--- a/src/keyfiles.c
+++ b/src/keyfiles.c
@@ -890,6 +890,8 @@ 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;
}
@@ -911,6 +913,8 @@ 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;
}