lavf/libssh: improve authentication
authorLukasz Marek <lukasz.m.luki@gmail.com>
Sat, 28 Dec 2013 18:34:29 +0000 (19:34 +0100)
committerLukasz Marek <lukasz.m.luki@gmail.com>
Sun, 29 Dec 2013 15:24:07 +0000 (16:24 +0100)
- Add authentication using keys
- Provide better message on fail

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
libavformat/libssh.c

index e4d4267..aa9b060 100644 (file)
@@ -91,10 +91,13 @@ static int libssh_open(URLContext *h, const char *url, int flags)
         goto fail;
     }
 
-    if (pass && ssh_userauth_password(s->session, NULL, pass) != SSH_AUTH_SUCCESS) {
-        av_log(h, AV_LOG_ERROR, "Error authenticating with password: %s\n", ssh_get_error(s->session));
-        ret = AVERROR(EACCES);
-        goto fail;
+    if (ssh_userauth_autopubkey(s->session, pass) != SSH_AUTH_SUCCESS) {
+        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);
+            goto fail;
+        }
     }
 
     if (!(s->sftp = sftp_new(s->session))) {