wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-20 15:27:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

nss: update nss to hg rev e5e10a46b9ad with vc2013 hackfix

Browse source
This commit is contained in:
Roy Tam 2019-04-06 10:14:46 +08:00
commit dcdc5d70e0
133 changed files with 8084 additions and 2038 deletions
Download patch file Download diff file Expand all files Collapse all files

5
security/nss/tests/smime/alice.txt
View file

@ -1,6 +1 @@
Date: Wed, 20 Sep 2000 00:00:01 -0700 (PDT)
From: alice@bogus.com
Subject: message Alice --> Bob
To: bob@bogus.com
This is a test message from Alice to Bob.

4
security/nss/tests/smime/bob.txt
View file

@ -1,6 +1,6 @@
Date: Wed, 20 Sep 2000 00:00:01 -0700 (PDT)
From: bob@bogus.com
From: bob@example.com
Subject: message Bob --> Alice
To: alice@bogus.com
To: alice@example.com
This is a test message from Bob to Alice.

218
security/nss/tests/smime/smime.sh
View file

@ -51,12 +51,14 @@ smime_init()
mkdir -p ${SMIMEDIR}
cd ${SMIMEDIR}
cp ${QADIR}/smime/alice.txt ${SMIMEDIR}
mkdir tb
}
smime_sign()
cms_sign()
{
HASH_CMD="-H ${HASH}"
SIG=sig.${HASH}
HASH_CMD="-H SHA${HASH}"
SIG=sig.SHA${HASH}
echo "$SCRIPTNAME: Signing Detached Message {$HASH} ------------------"
echo "cmsutil -S -T -N Alice ${HASH_CMD} -i alice.txt -d ${P_R_ALICEDIR} -p nss -o alice.d${SIG}"
@ -102,23 +104,166 @@ smime_sign()
echo "diff alice.txt alice-ec.data.${HASH}"
diff alice.txt alice-ec.data.${HASH}
html_msg $? 0 "Compare Attached Signed Data and Original (ECDSA w/ ${HASH})" "."
}
header_mime_from_to_subject="MIME-Version: 1.0
From: Alice@example.com
To: Bob@example.com
Subject: "
header_opaque_signed="Content-Type: application/pkcs7-mime; name=smime.p7m;
smime-type=signed-data
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename=smime.p7m
Content-Description: S/MIME Cryptographic Signature
"
header_enveloped="Content-Type: application/pkcs7-mime; name=smime.p7m;
smime-type=enveloped-data
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename=smime.p7m
Content-Description: S/MIME Encrypted Message
"
header_clearsigned="Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Language: en-US
"
multipart_start="Content-Type: multipart/signed; protocol=\"application/pkcs7-signature\"; micalg=sha-HASHHASH; boundary=\"------------ms030903020902020502030404\"
This is a cryptographically signed message in MIME format.
--------------ms030903020902020502030404"
multipart_middle="
--------------ms030903020902020502030404
Content-Type: application/pkcs7-signature; name=smime.p7s
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename=smime.p7s
Content-Description: S/MIME Cryptographic Signature
"
multipart_end="--------------ms030903020902020502030404--
"
header_plaintext="Content-Type: text/plain
"
CR=$(printf '\r')
mime_init()
{
OUT="tb/alice.mime"
echo "${header_clearsigned}" >>${OUT}
cat alice.txt >>${OUT}
sed -i"" "s/\$/${CR}/" ${OUT}
OUT="tb/alice.textplain"
echo "${header_plaintext}" >>${OUT}
cat alice.txt >>${OUT}
sed -i"" "s/\$/${CR}/" ${OUT}
}
smime_enveloped()
{
${PROFTOOL} ${BINDIR}/cmsutil -E -r bob@example.com -i tb/alice.mime -d ${P_R_ALICEDIR} -p nss -o tb/alice.mime.env
OUT="tb/alice.env.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "enveloped ${SIG}" >>${OUT}
echo "${header_enveloped}" >>${OUT}
cat "tb/alice.mime.env" | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
echo >>${OUT}
sed -i"" "s/\$/${CR}/" ${OUT}
}
smime_signed_enveloped()
{
SIG=sig.SHA${HASH}
${PROFTOOL} ${BINDIR}/cmsutil -S -T -N Alice ${HASH_CMD} -i tb/alice.mime -d ${P_R_ALICEDIR} -p nss -o tb/alice.mime.d${SIG}
OUT="tb/alice.d${SIG}.multipart"
echo "${multipart_start}" | sed "s/HASHHASH/${HASH}/" >>${OUT}
cat tb/alice.mime | sed 's/\r$//' >>${OUT}
echo "${multipart_middle}" >>${OUT}
cat tb/alice.mime.d${SIG} | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
echo "${multipart_end}" >>${OUT}
${PROFTOOL} ${BINDIR}/cmsutil -E -r bob@example.com -i ${OUT} -d ${P_R_ALICEDIR} -p nss -o ${OUT}.env
OUT="tb/alice.d${SIG}.multipart.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "clear-signed ${SIG}" >>${OUT}
cat "tb/alice.d${SIG}.multipart" >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
OUT="tb/alice.d${SIG}.multipart.env.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "enveloped clear-signed $SIG" >>${OUT}
echo "$header_enveloped" >>${OUT}
cat "tb/alice.d${SIG}.multipart.env" | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
echo >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
${PROFTOOL} ${BINDIR}/cmsutil -S -N Alice ${HASH_CMD} -i tb/alice.textplain -d ${P_R_ALICEDIR} -p nss -o tb/alice.textplain.${SIG}
OUT="tb/alice.${SIG}.opaque"
echo "$header_opaque_signed" >>${OUT}
cat tb/alice.textplain.${SIG} | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
${PROFTOOL} ${BINDIR}/cmsutil -E -r bob@example.com -i ${OUT} -d ${P_R_ALICEDIR} -p nss -o ${OUT}.env
OUT="tb/alice.${SIG}.opaque.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "opaque-signed $SIG" >>${OUT}
cat "tb/alice.${SIG}.opaque" >>${OUT}
echo >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
OUT="tb/alice.${SIG}.opaque.env.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "enveloped opaque-signed $SIG" >>${OUT}
echo "$header_enveloped" >>$OUT
cat "tb/alice.${SIG}.opaque.env" | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
echo >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
# bad messages below
OUT="tb/alice.d${SIG}.multipart.bad.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "BAD clear-signed $SIG" >>${OUT}
cat "tb/alice.d${SIG}.multipart" | sed 's/test message from Alice/FAKE message NOT from Alice/' >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
OUT="tb/alice.d${SIG}.multipart.mismatch-econtent"
echo "${multipart_start}" | sed "s/HASHHASH/$HASH/" >>${OUT}
cat tb/alice.mime | sed 's/test message from Alice/FAKE message NOT from Alice/' | sed 's/\r$//' >>${OUT}
echo "${multipart_middle}" >>${OUT}
cat tb/alice.textplain.${SIG} | ${BINDIR}/btoa | sed 's/\r$//' >>${OUT}
echo "${multipart_end}" >>${OUT}
OUT="tb/alice.d${SIG}.multipart.mismatch-econtent.eml"
echo -n "${header_mime_from_to_subject}" >>${OUT}
echo "BAD mismatch-econtent $SIG" >>${OUT}
cat "tb/alice.d${SIG}.multipart.mismatch-econtent" >>${OUT}
sed -i"" "s/\$/$CR/" ${OUT}
}
smime_p7()
{
echo "$SCRIPTNAME: p7 util Data Tests ------------------------------"
echo "p7env -d ${P_R_ALICEDIR} -r Alice -i alice.txt -o alice_p7.env"
${PROFTOOL} ${BINDIR}/p7env -d ${P_R_ALICEDIR} -r Alice -i alice.txt -o alice.env
${PROFTOOL} ${BINDIR}/p7env -d ${P_R_ALICEDIR} -r Alice -i alice.txt -o alice_p7.env
html_msg $? 0 "Creating envelope for user Alice" "."
echo "p7content -d ${P_R_ALICEDIR} -i alice.env -o alice_p7.data"
${PROFTOOL} ${BINDIR}/p7content -d ${P_R_ALICEDIR} -i alice.env -o alice_p7.data -p nss
echo "p7content -d ${P_R_ALICEDIR} -i alice_p7.env -o alice_p7.data"
${PROFTOOL} ${BINDIR}/p7content -d ${P_R_ALICEDIR} -i alice_p7.env -o alice_p7.data -p nss
html_msg $? 0 "Verifying file delivered to user Alice" "."
sed -e '3,8p' -n alice_p7.data > alice_p7.data.sed
sed -e '3,3p' -n alice_p7.data > alice_p7.data.sed
echo "diff alice.txt alice_p7.data.sed"
diff alice.txt alice_p7.data.sed
@ -139,20 +284,26 @@ smime_p7()
########################################################################
smime_main()
{
mime_init
smime_enveloped
HASH=SHA1
smime_sign
HASH=SHA256
smime_sign
HASH=SHA384
smime_sign
HASH=SHA512
smime_sign
HASH="1"
cms_sign
smime_signed_enveloped
HASH="256"
cms_sign
smime_signed_enveloped
HASH="384"
cms_sign
smime_signed_enveloped
HASH="512"
cms_sign
smime_signed_enveloped
echo "$SCRIPTNAME: Enveloped Data Tests ------------------------------"
echo "cmsutil -E -r bob@bogus.com -i alice.txt -d ${P_R_ALICEDIR} -p nss \\"
echo "cmsutil -E -r bob@example.com -i alice.txt -d ${P_R_ALICEDIR} -p nss \\"
echo " -o alice.env"
${PROFTOOL} ${BINDIR}/cmsutil -E -r bob@bogus.com -i alice.txt -d ${P_R_ALICEDIR} -p nss -o alice.env
${PROFTOOL} ${BINDIR}/cmsutil -E -r bob@example.com -i alice.txt -d ${P_R_ALICEDIR} -p nss -o alice.env
html_msg $? 0 "Create Enveloped Data Alice" "."
echo "cmsutil -D -i alice.env -d ${P_R_BOBDIR} -p nss -o alice.data1"
@ -166,23 +317,23 @@ smime_main()
# multiple recip
echo "$SCRIPTNAME: Testing multiple recipients ------------------------------"
echo "cmsutil -E -i alice.txt -d ${P_R_ALICEDIR} -o alicecc.env \\"
echo " -r bob@bogus.com,dave@bogus.com"
echo " -r bob@example.com,dave@example.com"
${PROFTOOL} ${BINDIR}/cmsutil -E -i alice.txt -d ${P_R_ALICEDIR} -o alicecc.env \
-r bob@bogus.com,dave@bogus.com
-r bob@example.com,dave@example.com
ret=$?
html_msg $ret 0 "Create Multiple Recipients Enveloped Data Alice" "."
if [ $ret != 0 ] ; then
echo "certutil -L -d ${P_R_ALICEDIR}"
${BINDIR}/certutil -L -d ${P_R_ALICEDIR}
echo "certutil -L -d ${P_R_ALICEDIR} -n dave@bogus.com"
${BINDIR}/certutil -L -d ${P_R_ALICEDIR} -n dave@bogus.com
echo "certutil -L -d ${P_R_ALICEDIR} -n dave@example.com"
${BINDIR}/certutil -L -d ${P_R_ALICEDIR} -n dave@example.com
fi
echo "$SCRIPTNAME: Testing multiple email addrs ------------------------------"
echo "cmsutil -E -i alice.txt -d ${P_R_ALICEDIR} -o aliceve.env \\"
echo " -r eve@bogus.net"
echo " -r eve@example.net"
${PROFTOOL} ${BINDIR}/cmsutil -E -i alice.txt -d ${P_R_ALICEDIR} -o aliceve.env \
-r eve@bogus.net
-r eve@example.net
ret=$?
html_msg $ret 0 "Encrypt to a Multiple Email cert" "."
@ -208,9 +359,9 @@ smime_main()
html_msg $? 0 "Compare Decoded with Multiple Email cert" "."
echo "$SCRIPTNAME: Sending CERTS-ONLY Message ------------------------------"
echo "cmsutil -O -r \"Alice,bob@bogus.com,dave@bogus.com\" \\"
echo "cmsutil -O -r \"Alice,bob@example.com,dave@example.com\" \\"
echo " -d ${P_R_ALICEDIR} > co.der"
${PROFTOOL} ${BINDIR}/cmsutil -O -r "Alice,bob@bogus.com,dave@bogus.com" -d ${P_R_ALICEDIR} > co.der
${PROFTOOL} ${BINDIR}/cmsutil -O -r "Alice,bob@example.com,dave@example.com" -d ${P_R_ALICEDIR} > co.der
html_msg $? 0 "Create Certs-Only Alice" "."
echo "cmsutil -D -i co.der -d ${P_R_BOBDIR}"
@ -219,9 +370,9 @@ smime_main()
echo "$SCRIPTNAME: Encrypted-Data Message ---------------------------------"
echo "cmsutil -C -i alice.txt -e alicehello.env -d ${P_R_ALICEDIR} \\"
echo " -r \"bob@bogus.com\" > alice.enc"
echo " -r \"bob@example.com\" > alice.enc"
${PROFTOOL} ${BINDIR}/cmsutil -C -i alice.txt -e alicehello.env -d ${P_R_ALICEDIR} \
-r "bob@bogus.com" > alice.enc
-r "bob@example.com" > alice.enc
html_msg $? 0 "Create Encrypted-Data" "."
echo "cmsutil -D -i alice.enc -d ${P_R_BOBDIR} -e alicehello.env -p nss \\"
@ -232,6 +383,16 @@ smime_main()
diff alice.txt alice.data2
html_msg $? 0 "Compare Decoded and Original Data" "."
}
smime_data_tb()
{
${BINDIR}/pk12util -d ${P_R_ALICEDIR} -o tb/Alice.p12 -n Alice -K nss -W ""
${BINDIR}/pk12util -d ${P_R_BOBDIR} -o tb/Bob.p12 -n Bob -K nss -W ""
${BINDIR}/pk12util -d ${P_R_DAVEDIR} -o tb/Dave.p12 -n Dave -K nss -W ""
${BINDIR}/pk12util -d ${P_R_EVEDIR} -o tb/Eve.p12 -n Eve -K nss -W ""
CAOUT=tb/TestCA.pem
cat ${P_R_CADIR}/TestCA.ca.cert | sed 's/\r$//' | ${BINDIR}/btoa -w c >> ${CAOUT}
}
############################## smime_cleanup ###########################
# local shell function to finish this script (no exit since it might be
@ -248,6 +409,7 @@ smime_cleanup()
smime_init
smime_main
smime_data_tb
smime_p7
smime_cleanup