From nobody Mon Feb 9 07:55:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673972546; cv=none; d=zohomail.com; s=zohoarc; b=JYZgO7ZYjyf7P/UMcxB2EY+UigTo7w4AqEF02q+XgmLeGO7SWfX7PUBxRee8hj7uEYtspMigV21iQyxMBwAFxp1E959Llo/UKPDO+E/xUeJTdP9tZg1TCfPdZ69jggt6+OkmFlsRHzYO9X3NDyYFHwehGIMgSvfV3oMLNThPvDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673972546; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o0vK1Gf8e1K6B4gCcJWTEmNV1z+nmF/3mKcRi+AV8vA=; b=aNxPpY/uzGk5kfB880XEuBm57Qvv7Onlqfxm1UlfS6BnM2lRNacX736vbC6wBoS1fcnrAL3VbJPcidN2k4x6jOFcUehqQcqgs+88NJ+iNiRDBzG736V4+fm/QZQP8/2uCQaAIBzivqVywI2WHr0kExrz1AI3BNbUmRxcVwuI0sY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1673972546048879.8400894182101; Tue, 17 Jan 2023 08:22:26 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-zs6Fdz6SPdeeqnc3S4nsXA-1; Tue, 17 Jan 2023 11:22:10 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 29C3838288A6; Tue, 17 Jan 2023 16:20:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15555140EBF5; Tue, 17 Jan 2023 16:20:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EC2C919465A4; Tue, 17 Jan 2023 16:20:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A802719465A3 for ; Tue, 17 Jan 2023 16:20:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B2AB1121315; Tue, 17 Jan 2023 16:20:53 +0000 (UTC) Received: from speedmetal.lan (ovpn-208-29.brq.redhat.com [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CACC1121318 for ; Tue, 17 Jan 2023 16:20:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673972544; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=o0vK1Gf8e1K6B4gCcJWTEmNV1z+nmF/3mKcRi+AV8vA=; b=A8lJwVEg2J6DjxSMx8Ta3d8H1k6oIqX7fcKVxF+A8v3PF2QMKc0sLv2+Yi4SHdVFgzyyIN thbxbSirGjr+m8MpXDedrU4YvWiqZcSGeiZATM75gzsKVTzoO9+OOePBez3KvL1n+eYSij 3AXCqKpzJmsRgiWrz1J7Qm2XuF8kdRU= X-MC-Unique: zs6Fdz6SPdeeqnc3S4nsXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 11/15] virNetLibsshAuthenticatePrivkeyCb: Use virAuthAskCredential Date: Tue, 17 Jan 2023 17:20:36 +0100 Message-Id: <307f4ad471e331495aed74481e6086b479521e75.1673972406.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673972547073100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/rpc/virnetlibsshsession.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 942f8526c2..748c1ed569 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -394,10 +394,8 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt, void *userdata) { virNetLibsshSession *sess =3D userdata; - virConnectCredential retr_passphrase; - int cred_type; g_autofree char *actual_prompt =3D NULL; - int p; + g_autoptr(virConnectCredential) cred =3D NULL; /* request user's key password */ if (!sess->cred || !sess->cred->cb) { @@ -407,30 +405,12 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt, return -1; } - cred_type =3D virCredTypeForPrompt(sess->cred, echo); - if (cred_type =3D=3D -1) { - virReportError(VIR_ERR_LIBSSH, "%s", - _("no suitable callback for input of key passphrase= ")); - return -1; - } - actual_prompt =3D g_strndup(prompt, virLengthForPromptString(prompt)); - memset(&retr_passphrase, 0, sizeof(virConnectCredential)); - retr_passphrase.type =3D cred_type; - retr_passphrase.prompt =3D actual_prompt; - - if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { - virReportError(VIR_ERR_LIBSSH, "%s", - _("failed to retrieve private key passphrase: " - "callback has failed")); + if (!(cred =3D virAuthAskCredential(sess->cred, actual_prompt, echo))) return -1; - } - p =3D virStrcpy(buf, retr_passphrase.result, len); - virSecureEraseString(retr_passphrase.result); - g_free(retr_passphrase.result); - if (p < 0) { + if (virStrcpy(buf, cred->result, len) < 0) { virReportError(VIR_ERR_LIBSSH, "%s", _("passphrase is too long for the buffer")); return -1; --=20 2.38.1