From patchwork Sun Jun 11 17:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3919 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.195 with SMTP id 186csp578027vsk; Sun, 11 Jun 2017 10:57:23 -0700 (PDT) X-Received: by 10.223.150.237 with SMTP id u100mr5362703wrb.184.1497203843523; Sun, 11 Jun 2017 10:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497203843; cv=none; d=google.com; s=arc-20160816; b=SjkG0i8FuXgWb+ybs/RUjegTSl7y3Ouc+9eiem2Fyvi68kPk4ILmWySSxE3QTGbSxV 9l3WW5RFxrohyAUgRYx9usQKQZfJa1VgTsGkmNoE08++s1eDXYpZTR2FJUOGCmycH3Qo zuN9bC7DJh5YxNaGnF4EoqPmduDiLqYLbAtv0jVOk2taCQak7njZvapcZu/vN9i3332q L9tWLs49YixZOY4V9NpmO4K8ut41rHM+k8KnOE57HF94kRPQ6yJQFhw+tahyfpRH7Pfn x4rSMdMBbbz9LGo/0JjZNyVHvh1YVJcx0Y20AsldillTc4HTFbpMcfjRgsMc/gSICZ1V hAsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fLA3pU6ylb9zlwbL+rh7y6WdfdB5no0R7hhab2pLBMg=; b=FE3fH2bSIx8l2e1Iuc09EyqUSIyBeloL/PBL1O1nkdJLKFbVq4DtUgXNzJHdXBkbZZ ZEFrD9xpbKf0o1/LR+/wQlwDGP2YA3KgvLQEMZ0x9LK/DkbjI9Tr+ivHQsZBW1mggCv/ dS3fKuNH+Fv6V08b4QLkVE1vyjlVcAZW6CsdeNkj3Hdhajw7kilyRGnU8K7jsM4T3Nvg G38d0pPZQn2xiNFYUnmqlQhgP4bbZ3veBVc9NZY59e5B5MqsEaU0oXyXk1q5VQd8mXb8 /4m78yUzr+VloY0YufmNa7BCo6T8QhfymFysXiTWgo8omIHTDqqchyET36JuLN6eDeic FwTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 21si6997275wrt.177.2017.06.11.10.57.22; Sun, 11 Jun 2017 10:57:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24EC8689D27; Sun, 11 Jun 2017 20:57:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C52D9688314 for ; Sun, 11 Jun 2017 20:57:11 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id x58so22302126qtc.2 for ; Sun, 11 Jun 2017 10:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=OQDkSNFF78WAvLrItoVPpydpawbZN1yfygAOuPBTZQk=; b=ME/TiW2B/LB2SEOhT3ZpqUnZ1L7rYLQ6fiffzs11F0a8owwyJbyO/hlfoSffKeT02q C1y1Z6ryFzYrfrStg/VAbESpOx/sceVbAVJysF1YRlrLTSvNomJaO15fBw3gj4LW7Qu2 urOq5gmrTMBpTHJmy7/CiFtuqqtxKsZR/Pv+vutJV14KELvd337VG7+TWPaGFTVxgiT+ A71TCuww3c24PaJ1nbO1uYwJMvzW2lzlOOr9v7JKnrUmdUIDJB2zqIXoVhAWseBwhFbv NKOM7xxDXawBnK6eHyIBewqCLiwVTV5Nw10wVspQgkLnUNxbZP1iXLkPl0ge0+Zx8E7C 9oxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=OQDkSNFF78WAvLrItoVPpydpawbZN1yfygAOuPBTZQk=; b=GgRUehx6tXgpPHVtvLQxvuYWVo5LEwNQ0+pNRwUoVZBBOFnkfqb7AGQJuP13JgCwp7 MDz8r5YBOYONU8ZmdkbJSh67xvT+GzpARlN3nCjNIDHUzCXpmbqwrpgHsHAeWnk3nOT3 0iRx3FAjHhZsQjkdHGGEVArPPzPHSgffyYWYLHshSAxTnZxvbGh721syLD46YK62Gqi8 bBLZgYh8YQjOmFo0S/gA1926oSLUryExKw4SGXcdzmHlVG2yKvlrCwi1R7iFb8CLKPup wKk5mG5s8a2swxbHo2gVoCzgFzY0Aigq5TBfhUb9QJFo0IRDRpIDiWv38TvqpCQrwZCq FkeA== X-Gm-Message-State: AODbwcBpJlGfoeLfzas6IFN5+r+j2jy06vUh4NsH/BbaqBbDggyLML4f IcX0PubU2lr91ic1 X-Received: by 10.55.103.207 with SMTP id b198mr57497702qkc.55.1497203385082; Sun, 11 Jun 2017 10:49:45 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id b23sm5210383qtb.5.2017.06.11.10.49.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Jun 2017 10:49:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Jun 2017 14:47:47 -0300 Message-Id: <20170611174747.8328-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avformat/libssh: check the user provided a password before trying to use it X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #6413 Signed-off-by: James Almer --- The public key authentication also tries to use the password variable. I don't know if NULL is valid in that case or not. Perhaps for that one it would be better to replace the current usage of legacy API instead. libavformat/libssh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/libssh.c b/libavformat/libssh.c index 49e92e7516..9e3d4da45e 100644 --- a/libavformat/libssh.c +++ b/libavformat/libssh.c @@ -103,7 +103,7 @@ static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user } } - if (!authorized && (auth_methods & SSH_AUTH_METHOD_PASSWORD)) { + if (!authorized && password && (auth_methods & SSH_AUTH_METHOD_PASSWORD)) { if (ssh_userauth_password(libssh->session, NULL, password) == SSH_AUTH_SUCCESS) { av_log(libssh, AV_LOG_DEBUG, "Authentication successful with password.\n"); authorized = 1;