diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-07-19 22:16:28 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2011-07-19 22:16:28 +0200 |
| commit | da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9 (patch) | |
| tree | b13cc18e78ff7a0549974b4823678f189fe82b6a /src/keyfiles.c | |
| parent | dc9ac022f5590272cc7a3dc18726802ffdc73c8f (diff) | |
| download | libssh-da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9.tar.gz libssh-da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9.tar.xz libssh-da954c2c5ee85bcbe2f5ad9f507a6306b0f5f8b9.zip | |
Fixes the ssh_log issue on ssh_bind handles.
Diffstat (limited to 'src/keyfiles.c')
| -rw-r--r-- | src/keyfiles.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/keyfiles.c b/src/keyfiles.c index 6d8ced6..0540a5d 100644 --- a/src/keyfiles.c +++ b/src/keyfiles.c @@ -995,7 +995,7 @@ ssh_private_key privatekey_from_base64(ssh_session session, const char *b64_pkey ssh_log(session, SSH_LOG_RARE, "Trying to read privkey type=%s, passphase=%s, authcb=%s", type ? type == SSH_KEYTYPE_DSS ? "ssh-dss" : "ssh-rsa": "unknown", passphrase ? "true" : "false", - session->callbacks && session->callbacks->auth_function ? "true" : "false"); + session->common.callbacks && session->common.callbacks->auth_function ? "true" : "false"); if (type == 0) { type = privatekey_type_from_string(b64_pkey); @@ -1008,9 +1008,9 @@ ssh_private_key privatekey_from_base64(ssh_session session, const char *b64_pkey case SSH_KEYTYPE_DSS: #ifdef HAVE_LIBGCRYPT if (passphrase == NULL) { - if (session->callbacks && session->callbacks->auth_function) { - auth_cb = session->callbacks->auth_function; - auth_ud = session->callbacks->userdata; + if (session->common.callbacks && session->common.callbacks->auth_function) { + auth_cb = session->common.callbacks->auth_function; + auth_ud = session->common.callbacks->userdata; valid = b64decode_dsa_privatekey(b64_pkey, &dsa, auth_cb, auth_ud, "Passphrase for private key:"); @@ -1052,9 +1052,9 @@ ssh_private_key privatekey_from_base64(ssh_session session, const char *b64_pkey case SSH_KEYTYPE_RSA: #ifdef HAVE_LIBGCRYPT if (passphrase == NULL) { - if (session->callbacks && session->callbacks->auth_function) { - auth_cb = session->callbacks->auth_function; - auth_ud = session->callbacks->userdata; + if (session->common.callbacks && session->common.callbacks->auth_function) { + auth_cb = session->common.callbacks->auth_function; + auth_ud = session->common.callbacks->userdata; valid = b64decode_rsa_privatekey(b64_pkey, &rsa, auth_cb, auth_ud, "Passphrase for private key:"); } else { /* authcb */ |