aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2010-10-03 16:16:30 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2010-10-03 16:16:30 +0200
commit088b86d4fe8288ca0da1ee305be04285f5cd7da6 (patch)
tree2bd9e30691e2c9eb46d000fdec16b7ef2422ffab
parent9a89fba3329d7557f9415c5d629b0bf783fe5685 (diff)
downloadlibssh-088b86d4fe8288ca0da1ee305be04285f5cd7da6.tar.gz
libssh-088b86d4fe8288ca0da1ee305be04285f5cd7da6.tar.xz
libssh-088b86d4fe8288ca0da1ee305be04285f5cd7da6.zip
Fix doxygen warnings
-rw-r--r--src/keyfiles.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/keyfiles.c b/src/keyfiles.c
index 854123a9..08169787 100644
--- a/src/keyfiles.c
+++ b/src/keyfiles.c
@@ -705,8 +705,8 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
switch (type) {
case SSH_KEYTYPE_DSS:
if (passphrase == NULL) {
- if (session->callbacks && session->callbacks->auth_function) {
#ifdef HAVE_LIBGCRYPT
+ if (session->callbacks && session->callbacks->auth_function) {
auth_cb = session->callbacks->auth_function;
auth_ud = session->callbacks->userdata;
@@ -725,6 +725,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
if (!valid) {
ssh_set_error(session, SSH_FATAL, "Parsing private key %s", filename);
#elif defined HAVE_LIBCRYPTO
+ if (session->callbacks && session->callbacks->auth_function) {
dsa = PEM_read_DSAPrivateKey(file, NULL, pem_get_password, session);
} else { /* authcb */
/* openssl uses its own callback to get the passphrase here */
@@ -745,8 +746,8 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
break;
case SSH_KEYTYPE_RSA:
if (passphrase == NULL) {
- if (session->callbacks && session->callbacks->auth_function) {
#ifdef HAVE_LIBGCRYPT
+ if (session->callbacks && session->callbacks->auth_function) {
auth_cb = session->callbacks->auth_function;
auth_ud = session->callbacks->userdata;
valid = read_rsa_privatekey(file, &rsa, auth_cb, auth_ud,
@@ -764,6 +765,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
if (!valid) {
ssh_set_error(session,SSH_FATAL, "Parsing private key %s", filename);
#elif defined HAVE_LIBCRYPTO
+ if (session->callbacks && session->callbacks->auth_function) {
rsa = PEM_read_RSAPrivateKey(file, NULL, pem_get_password, session);
} else { /* authcb */
/* openssl uses its own callback to get the passphrase here */