shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

keyfiles: Move the auth callback inside the HAVE_LIBGCRYPT ifdef.

Browse Source
This commit is contained in:
Andreas Schneider
2010-06-02 20:06:51 +02:00
parent 8f0d40a1dd
commit f3697a0d5c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libssh/keyfiles.c
View File

@@ -666,11 +666,12 @@ static int privatekey_type_from_file(FILE *fp) {
*/ */
ssh_private_key privatekey_from_file(ssh_session session, const char *filename, ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
int type, const char *passphrase) { int type, const char *passphrase) {
ssh_auth_callback auth_cb = NULL;
ssh_private_key privkey = NULL; ssh_private_key privkey = NULL;
void *auth_ud = NULL;
FILE *file = NULL; FILE *file = NULL;
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
ssh_auth_callback auth_cb = NULL;
void *auth_ud = NULL;
gcry_sexp_t dsa = NULL; gcry_sexp_t dsa = NULL;
gcry_sexp_t rsa = NULL; gcry_sexp_t rsa = NULL;
int valid; int valid;
@@ -704,10 +705,10 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
case SSH_KEYTYPE_DSS: case SSH_KEYTYPE_DSS:
if (passphrase == NULL) { if (passphrase == NULL) {
if (session->callbacks && session->callbacks->auth_function) { if (session->callbacks && session->callbacks->auth_function) {
#ifdef HAVE_LIBGCRYPT
auth_cb = session->callbacks->auth_function; auth_cb = session->callbacks->auth_function;
auth_ud = session->callbacks->userdata; auth_ud = session->callbacks->userdata;
#ifdef HAVE_LIBGCRYPT
valid = read_dsa_privatekey(file, &dsa, auth_cb, auth_ud, valid = read_dsa_privatekey(file, &dsa, auth_cb, auth_ud,
"Passphrase for private key:"); "Passphrase for private key:");
} else { /* authcb */ } else { /* authcb */
@@ -744,9 +745,9 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
case SSH_KEYTYPE_RSA: case SSH_KEYTYPE_RSA:
if (passphrase == NULL) { if (passphrase == NULL) {
if (session->callbacks && session->callbacks->auth_function) { if (session->callbacks && session->callbacks->auth_function) {
#ifdef HAVE_LIBGCRYPT
auth_cb = session->callbacks->auth_function; auth_cb = session->callbacks->auth_function;
auth_ud = session->callbacks->userdata; auth_ud = session->callbacks->userdata;
#ifdef HAVE_LIBGCRYPT
valid = read_rsa_privatekey(file, &rsa, auth_cb, auth_ud, valid = read_rsa_privatekey(file, &rsa, auth_cb, auth_ud,
"Passphrase for private key:"); "Passphrase for private key:");
} else { /* authcb */ } else { /* authcb */