Skip to content

Fix call to ssh2_auth_pubkey[_file]() without password #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
langemeijer merged 2 commits into from
Nov 23, 2025
+4 −4
Merged

Fix call to ssh2_auth_pubkey[_file]() without password #88

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f251b48
Fix call to ssh2_auth_pubkey_file() without password
Nov 21, 2025
c6331ad
Fix call to ssh2_auth_pubkey() without password
cweiske Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ssh2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ PHP_FUNCTION(ssh2_auth_pubkey_file)
{
LIBSSH2_SESSION *session;
zval *zsession;
zend_string *username, *pubkey, *privkey, *passphrase;
zend_string *username, *pubkey, *privkey, *passphrase = NULL;
#ifndef PHP_WIN32
zend_string *newpath;
struct passwd *pws;
Expand Down Expand Up @@ -689,7 +689,7 @@ PHP_FUNCTION(ssh2_auth_pubkey_file)
#endif

/* TODO: Support passphrase callback */
if (libssh2_userauth_publickey_fromfile_ex(session, ZSTR_VAL(username), ZSTR_LEN(username), ZSTR_VAL(pubkey), ZSTR_VAL(privkey), ZSTR_VAL(passphrase))) {
if (libssh2_userauth_publickey_fromfile_ex(session, ZSTR_VAL(username), ZSTR_LEN(username), ZSTR_VAL(pubkey), ZSTR_VAL(privkey), passphrase ? ZSTR_VAL(passphrase) : NULL)) {
char *buf;
int len;
libssh2_session_last_error(session, &buf, &len, 0);
Expand All @@ -709,15 +709,15 @@ PHP_FUNCTION(ssh2_auth_pubkey)
{
LIBSSH2_SESSION *session;
zval *zsession;
zend_string *username, *pubkey, *privkey, *passphrase;
zend_string *username, *pubkey, *privkey, *passphrase = NULL;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "rSSS|S", &zsession, &username, &pubkey, &privkey, &passphrase) == FAILURE) {
return;
}

SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession);

if (libssh2_userauth_publickey_frommemory(session, ZSTR_VAL(username), ZSTR_LEN(username), ZSTR_VAL(pubkey), ZSTR_LEN(pubkey), ZSTR_VAL(privkey), ZSTR_LEN(privkey), ZSTR_VAL(passphrase))) {
if (libssh2_userauth_publickey_frommemory(session, ZSTR_VAL(username), ZSTR_LEN(username), ZSTR_VAL(pubkey), ZSTR_LEN(pubkey), ZSTR_VAL(privkey), ZSTR_LEN(privkey), passphrase ? ZSTR_VAL(passphrase) : NULL)) {
char *buf;
int len;
libssh2_session_last_error(session, &buf, &len, 0);
Expand Down
Loading