Commit 8ba77dfb authored by Lukasz Marek's avatar Lukasz Marek

lavf/libssh: improve authentication

- Add authentication using keys
- Provide better message on fail
Signed-off-by: 's avatarLukasz Marek <lukasz.m.luki@gmail.com>
parent 247a8fa7
...@@ -91,11 +91,14 @@ static int libssh_open(URLContext *h, const char *url, int flags) ...@@ -91,11 +91,14 @@ static int libssh_open(URLContext *h, const char *url, int flags)
goto fail; goto fail;
} }
if (pass && ssh_userauth_password(s->session, NULL, pass) != SSH_AUTH_SUCCESS) { if (ssh_userauth_autopubkey(s->session, pass) != SSH_AUTH_SUCCESS) {
av_log(h, AV_LOG_ERROR, "Error authenticating with password: %s\n", ssh_get_error(s->session)); av_log(s, AV_LOG_DEBUG, "Authentication using public key failed, trying password method.\n");
if (ssh_userauth_password(s->session, NULL, pass) != SSH_AUTH_SUCCESS) {
av_log(h, AV_LOG_ERROR, "Authentication failed.\n");
ret = AVERROR(EACCES); ret = AVERROR(EACCES);
goto fail; goto fail;
} }
}
if (!(s->sftp = sftp_new(s->session))) { if (!(s->sftp = sftp_new(s->session))) {
av_log(h, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(s->session)); av_log(h, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(s->session));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment