From nobody Mon Mar 20 09:23:09 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg8RL14VPz40T2k; Mon, 20 Mar 2023 09:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg8RL0ZfPz4F87; Mon, 20 Mar 2023 09:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679304190; h=from:from: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; bh=/kxr7d4tmfKujfFFBfoIK/uwJ+cLc4ezH2PhppYEmW4=; b=NiztfwGf+KfuDO43XRkDlH+BmDJqq+r94PEOH9LdQuDpHDt2WAGxU+bQOe4jrJ1VpBVx7a tigWTG76act5H15Z8wDU8osckUlfQVlQ04kmgxnUFbCsAfjYM2tGCC8FebT+/VC7SuBItq 5t4M2bxCxPMRfkrm4rFYFtZpxjFxugzrIAwKiiV0o8QMqnX8z5cqNm+Jo+HUzfpGHDXXFH /36Vh72jGKz0KgXuQZaU08q5jTlL9EzxGfClTkRNI1unHxFD5s24bdVgnvJeay7FGVoxwo 4MNggSCIyOvGTs15SOdgEceyBGgcqLDdMk229TEyJ5jEcS5EiqFjug4CCgDf1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679304190; h=from:from: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; bh=/kxr7d4tmfKujfFFBfoIK/uwJ+cLc4ezH2PhppYEmW4=; b=mQH5s73EPbuchtfHrV6TXiuahrqOJRu2Yg/kwJT9VKABM3RvydSwsRfBDdITCiyguPF/8Z wbnxzwAuxtMNuUtUSgq5Vmub4Dkqtrgu5yJLmak6oJj2+znISSbyIJo0wP5kcbHZNuLQ2U fpwqotCkRlVtp19V95pPkY3fzqfpRQHo3Tq4PjLO8i3y9qYsEWz5gA0/psskZsXf0s5YAe b9XTghhUev5xriipi50VFeqdopOqnPuvHe9FCuH32HCJo/H81tPaaOCP/kC/n/8HWzAeYO Vr/kXH3C8YFhAPwwSZ2+0WjocpANAeiNssEwa661iPobJSw0gC5LnnwIGCXA5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679304190; a=rsa-sha256; cv=none; b=funohmXfUpa2WVj+onayysUhqrNa8HfpZ2kvEr8bDsLK2lXikrlEl86o8LqJTEd7emVhE8 eyAkZaVrks84ud1U94LMd7ogJJieGpE+gsLqEccxql9kt+3MohzoaqqRQxaQdCllkXZHyb Id5LjBH8h3zghPk7ttyBadyvATK8QLOqP/+K4+5sg25azwgWBbg2AIz3qDgJmw4nVng0TA Raq0AEwv7Jkrxud/mrdf2Omn5LLSma2Uw/NXIQNp3UsWSER1NuSCisyUU/wzwUlBwWK7e0 ssKq5+zCc7ke/aV8Ic0vTkmjx8ONCAj74q702TY5lItGsTtbYtQ+UqB3gLdOTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg8RK6R9tzPwm; Mon, 20 Mar 2023 09:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K9N9H8062478; Mon, 20 Mar 2023 09:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K9N96N062477; Mon, 20 Mar 2023 09:23:09 GMT (envelope-from git) Date: Mon, 20 Mar 2023 09:23:09 GMT Message-Id: <202303200923.32K9N96N062477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: ffbbc33b066e - main - security/pam_ssh_agent_auth: update to latest commit 099beb2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffbbc33b066edf2eb2ec49177c7aa87481a80c18 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffbbc33b066edf2eb2ec49177c7aa87481a80c18 commit ffbbc33b066edf2eb2ec49177c7aa87481a80c18 Author: Matthew Seaman AuthorDate: 2023-03-20 09:20:01 +0000 Commit: Matthew Seaman CommitDate: 2023-03-20 09:23:02 +0000 security/pam_ssh_agent_auth: update to latest commit 099beb2 Upstream has incorporated a patch we had locally, and fixed a misleading comment in their documentation. While here, update WWW --- security/pam_ssh_agent_auth/Makefile | 6 ++-- security/pam_ssh_agent_auth/distinfo | 6 ++-- .../pam_ssh_agent_auth/files/patch-ssh-ecdsa.c | 42 ---------------------- 3 files changed, 6 insertions(+), 48 deletions(-) diff --git a/security/pam_ssh_agent_auth/Makefile b/security/pam_ssh_agent_auth/Makefile index f75f3cc83684..c177972eb465 100644 --- a/security/pam_ssh_agent_auth/Makefile +++ b/security/pam_ssh_agent_auth/Makefile @@ -1,15 +1,15 @@ PORTNAME= pam_ssh_agent_auth PORTVERSION= 0.10.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= matthew@FreeBSD.org COMMENT= PAM module which permits authentication via ssh-agent -WWW= http://pamsshagentauth.sourceforge.net/ +WWW= https://github.com/jbeverly/pam_ssh_agent_auth USE_GITHUB= yes GH_ACCOUNT= jbeverly -GH_TAGNAME= 7ff7858 +GH_TAGNAME= 099beb2 GH_TUPLE= floodyberry:ed25519-donna:8757bd4:floodyberry_ed25519_donna/ed25519-donna BROKEN_mips64= fails to compile: ed25519-donna-portable.h:85:4: Need a uint128_t implementation! diff --git a/security/pam_ssh_agent_auth/distinfo b/security/pam_ssh_agent_auth/distinfo index 57aefdab777e..6bff9f977611 100644 --- a/security/pam_ssh_agent_auth/distinfo +++ b/security/pam_ssh_agent_auth/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1593675977 -SHA256 (jbeverly-pam_ssh_agent_auth-0.10.4-7ff7858_GH0.tar.gz) = 57b9d93c5ddfa157fe795a48dc8f913a8fb35d22085997d5062595020d5811c2 -SIZE (jbeverly-pam_ssh_agent_auth-0.10.4-7ff7858_GH0.tar.gz) = 307123 +TIMESTAMP = 1679303675 +SHA256 (jbeverly-pam_ssh_agent_auth-0.10.4-099beb2_GH0.tar.gz) = 3a95a2c23d23e6130b5200b2c26e9fbf9466d8d80954b154dd5e1680319b8d8c +SIZE (jbeverly-pam_ssh_agent_auth-0.10.4-099beb2_GH0.tar.gz) = 307178 SHA256 (floodyberry-ed25519-donna-8757bd4_GH0.tar.gz) = bc0d6c06ee9b23b03a47f11c75fbe88abcaac08834ced07e297d0674f0710bff SIZE (floodyberry-ed25519-donna-8757bd4_GH0.tar.gz) = 1169879 diff --git a/security/pam_ssh_agent_auth/files/patch-ssh-ecdsa.c b/security/pam_ssh_agent_auth/files/patch-ssh-ecdsa.c deleted file mode 100644 index b684b134d92d..000000000000 --- a/security/pam_ssh_agent_auth/files/patch-ssh-ecdsa.c +++ /dev/null @@ -1,42 +0,0 @@ ---- ssh-ecdsa.c.orig 2019-07-08 16:36:13 UTC -+++ ssh-ecdsa.c -@@ -46,7 +46,7 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *l - u_int len, dlen; - Buffer b, bb; - #if OPENSSL_VERSION_NUMBER >= 0x10100005L -- BIGNUM *r, *s; -+ BIGNUM *r = NULL, *s = NULL; - #endif - - if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) { -@@ -137,20 +137,27 @@ ssh_ecdsa_verify(const Key *key, const u_char *signatu - - /* parse signature */ - if ((sig = ECDSA_SIG_new()) == NULL) -- pamsshagentauth_fatal("ssh_ecdsa_verify: DSA_SIG_new failed"); -+ pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_new failed"); - - pamsshagentauth_buffer_init(&b); - pamsshagentauth_buffer_append(&b, sigblob, len); - #if OPENSSL_VERSION_NUMBER < 0x10100005L - if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) || - (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1)) -+ pamsshagentauth_fatal("ssh_ecdsa_verify:" -+ "pamsshagentauth_buffer_get_bignum2_ret failed"); - #else -- DSA_SIG_get0(sig, &r, &s); -+ if ((r = BN_new()) == NULL) -+ pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); -+ if ((s = BN_new()) == NULL) -+ pamsshagentauth_fatal("ssh_ecdsa_verify: BN_new failed"); - if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) || - (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1)) --#endif - pamsshagentauth_fatal("ssh_ecdsa_verify:" - "pamsshagentauth_buffer_get_bignum2_ret failed"); -+ if (ECDSA_SIG_set0(sig, r, s) != 1) -+ pamsshagentauth_fatal("ssh_ecdsa_verify: ECDSA_SIG_set0 failed"); -+#endif - - /* clean up */ - memset(sigblob, 0, len);