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

Fixed build on openssl

Browse Source
This commit is contained in:
Aris Adamantiadis
2011-07-20 09:56:43 +02:00
parent da954c2c5e
commit 0943ce3a4a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/keyfiles.c
View File

@@ -875,9 +875,9 @@ static int pem_get_password(char *buf, int size, int rwflag, void *userdata) {
ssh_log(session, SSH_LOG_RARE, ssh_log(session, SSH_LOG_RARE,
"Trying to call external authentication function"); "Trying to call external authentication function");
if (session && session->callbacks && session->callbacks->auth_function) { if (session && session->common.callbacks && session->common.callbacks->auth_function) {
if (session->callbacks->auth_function("Passphrase for private key:", buf, size, 0, 0, if (session->common.callbacks->auth_function("Passphrase for private key:", buf, size, 0, 0,
session->callbacks->userdata) < 0) { session->common.callbacks->userdata) < 0) {
return 0; return 0;
} }
@@ -1029,7 +1029,7 @@ ssh_private_key privatekey_from_base64(ssh_session session, const char *b64_pkey
#elif defined HAVE_LIBCRYPTO #elif defined HAVE_LIBCRYPTO
mem = BIO_new_mem_buf((void*)b64_pkey, -1); mem = BIO_new_mem_buf((void*)b64_pkey, -1);
if (passphrase == NULL) { if (passphrase == NULL) {
if (session->callbacks && session->callbacks->auth_function) { if (session->common.callbacks && session->common.callbacks->auth_function) {
dsa = PEM_read_bio_DSAPrivateKey(mem, NULL, pem_get_password, session); dsa = PEM_read_bio_DSAPrivateKey(mem, NULL, pem_get_password, session);
} else { /* authcb */ } else { /* authcb */
/* openssl uses its own callback to get the passphrase here */ /* openssl uses its own callback to get the passphrase here */
@@ -1072,7 +1072,7 @@ ssh_private_key privatekey_from_base64(ssh_session session, const char *b64_pkey
#elif defined HAVE_LIBCRYPTO #elif defined HAVE_LIBCRYPTO
mem = BIO_new_mem_buf((void*)b64_pkey, -1); mem = BIO_new_mem_buf((void*)b64_pkey, -1);
if (passphrase == NULL) { if (passphrase == NULL) {
if (session->callbacks && session->callbacks->auth_function) { if (session->common.callbacks && session->common.callbacks->auth_function) {
rsa = PEM_read_bio_RSAPrivateKey(mem, NULL, pem_get_password, session); rsa = PEM_read_bio_RSAPrivateKey(mem, NULL, pem_get_password, session);
} else { /* authcb */ } else { /* authcb */
/* openssl uses its own callback to get the passphrase here */ /* openssl uses its own callback to get the passphrase here */