mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-11 10:40:27 +09:00
Add functions without any passphrase.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@565 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
@@ -639,10 +639,7 @@ PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename,
|
|||||||
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 */
|
||||||
/* FIXME implement simple passphrase function? */
|
valid = read_dsa_privatekey(file, &dsa, NULL, NULL, NULL);
|
||||||
ssh_log(session, SSH_LOG_RARE,
|
|
||||||
"No passphrase or authtentication callback specified.");
|
|
||||||
return NULL;
|
|
||||||
} /* authcb */
|
} /* authcb */
|
||||||
} else { /* passphrase */
|
} else { /* passphrase */
|
||||||
valid = read_dsa_privatekey(file, &dsa, NULL,
|
valid = read_dsa_privatekey(file, &dsa, NULL,
|
||||||
@@ -683,10 +680,7 @@ PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename,
|
|||||||
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 */
|
||||||
/* FIXME implement simple passphrase function? */
|
valid = read_rsa_privatekey(file, &rsa, NULL, NULL, NULL);
|
||||||
ssh_log(session, SSH_LOG_RARE,
|
|
||||||
"No passphrase or authtentication callback specified.");
|
|
||||||
return NULL;
|
|
||||||
} /* authcb */
|
} /* authcb */
|
||||||
} else { /* passphrase */
|
} else { /* passphrase */
|
||||||
valid = read_rsa_privatekey(file, &rsa, NULL,
|
valid = read_rsa_privatekey(file, &rsa, NULL,
|
||||||
|
|||||||
Reference in New Issue
Block a user