public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/nss] rawhide: Restore tools_p12_ml_dsa_import function hunk in ml-dsa pkcs12 patch
Date: Fri, 21 Aug 2026 11:21:19 GMT [thread overview]
Message-ID: <178731127901.1.12549443328384409102.rpms-nss-73f7c7a971a6@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/nss
Branch : rawhide
Commit : 73f7c7a971a6faa5e52d9f5b599ed63a5adc5f47
Author : Krenželok František <fkrenzel@redhat.com>
Date : 2026-08-20T17:19:56+02:00
Stats : +35/-1 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/nss/c/73f7c7a971a6faa5e52d9f5b599ed63a5adc5f47?branch=rawhide
Log:
Restore tools_p12_ml_dsa_import function hunk in ml-dsa pkcs12 patch
The function is NOT in the clean 3.127.0 source (the earlier grep hit
a stale previously-patched build tree). Restore the function definition
hunk with the correct context for 3.127, which has
tools_p12_import_ed25519_private_key() immediately before
tools_p12_ml_kem_import() — same 'return $ret / } / blank /
tools_p12_ml_kem_import()' context lines work for both.
Also update the call-site hunk offset to +652 to account for both
hunk 1 (+9 cp lines) and the restored hunk 2 (+27 function lines).
---
diff --git a/nss-3.118-ml-dsa-test-for-sign-verify-pkcs12.patch b/nss-3.118-ml-dsa-test-for-sign-verify-pkcs12.patch
index b91a1b1..8a3afad 100644
--- a/nss-3.118-ml-dsa-test-for-sign-verify-pkcs12.patch
+++ b/nss-3.118-ml-dsa-test-for-sign-verify-pkcs12.patch
@@ -437,7 +437,41 @@ diff --git a/tests/tools/tools.sh b/tests/tools/tools.sh
cp ${QADIR}/tools/openssl-ml-kem-768-seed.p12 ${TOOLSDIR}/data
cp ${QADIR}/tools/openssl-ml-kem-768-priv.p12 ${TOOLSDIR}/data
cp ${QADIR}/tools/openssl-ml-kem-768-both.p12 ${TOOLSDIR}/data
-@@ -616,7 +619,8 @@
+@@ -536,6 +545,33 @@
+ return $ret
+ }
+
++tools_p12_ml_dsa_import()
++{
++ echo "$SCRIPTNAME: Testing ml-dsa compatibility with pkcs12 --------------"
++ for i in 44 65 87
++ do
++ echo "${BINDIR}/pk12util -i ${TOOLSDIR}/data/openssl-ml-dsa-$i.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W 'test' 2>&1"
++ ${BINDIR}/pk12util -i ${TOOLSDIR}/data/openssl-ml-dsa-$i.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W 'test' 2>&1
++ ret=$?
++ html_msg $ret 0 "Importing openssl encoded ml-dsa-$i private key from PKCS#12 file"
++ check_tmpfile
++ for j in 'key' 'both'
++ do
++ echo "${BINDIR}/pk12util -i ${TOOLSDIR}/data/ietf-ml-dsa-$i-$j.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W 'test' 2>&1"
++ ${BINDIR}/pk12util -i ${TOOLSDIR}/data/ietf-ml-dsa-$i-$j.p12 -d ${P_R_COPYDIR} -k ${R_PWFILE} -W 'test' 2>&1
++ ret=$?
++ html_msg $ret 0 "Importing openssl encoded ml-dsa-$i private key from PKCS#12 file"
++ check_tmpfile
++ html_msg $ret 0 "Importing ietf sample ml-dsa-$i-$j private key from PKCS#12 file"
++
++ # each cert has the same issuer/sn, so we can't hold more than one in
++ # the data base
++ echo "${BINDIR}/certutil -F -n \"ietf ml-dsa-$i-$j sample\" -d ${P_R_COPYDIR} -f ${R_PWFILE}"
++ ${BINDIR}/certutil -F -n "ietf ml-dsa-$i-$j sample" -d ${P_R_COPYDIR} -f ${R_PWFILE}
++ done
++ done
++}
++
+ tools_p12_ml_kem_import()
+ {
+ echo "$SCRIPTNAME: Testing ml-kem compatibility with pkcs12 --------------"
+@@ -616,7 +652,8 @@
tools_p12_export_with_invalid_ciphers
tools_p12_import_old_files
tools_p12_import_pbmac1_samples
reply other threads:[~2026-08-21 11:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178731127901.1.12549443328384409102.rpms-nss-73f7c7a971a6@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox