security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Merge branch 'STABLE-BRANCH-2-4'

Browse source 
--
Fixed conflicts:
	NEWS
	configure.ac
	doc/gpg.texi
This commit is contained in:
Werner Koch 2024-01-26 09:41:00 +01:00
commit dfa60c09f5
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
88 changed files with 2655 additions and 1419 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/cms/Makefile.am
View file

@ -99,8 +99,11 @@ EXTRA_DIST = $(XTESTS) $(KEYS) $(CERTS) $(TEST_FILES) \
samplekeys/opensc-test.p12 \
samplekeys/t5793-openssl.pfx \
samplekeys/t5793-test.pfx \
samplekeys/t6752-ov-user-ff.p12 \
samplekeys/edward.tester@demo.gnupg.com.p12 \
samplekeys/nistp256-openssl-self-signed.p12 \
samplekeys/credential_private_encrypted_AES256.p12 \
samplekeys/credential_private_encrypted_3DES.p12 \
samplemsgs/pwri-sample.cbc.p7m \
samplemsgs/pwri-sample.cbc-2.p7m \
samplemsgs/pwri-sample.gcm.p7m \

12
tests/cms/samplekeys/Description-p12
View file

@ -51,4 +51,16 @@ Pass: start
Cert: 4753a910e0c8b4caa8663ca0e4273a884eb5397d
Key: 93be89edd11214ab74280d988a665b6beef876c5
Name: credential_private_encrypted_AES256.p12
Desc: AES256 encrypted P12 file from T6940
Pass: qeFGds84/Sf0eKkJwcp6
Cert: 20f65740b4a15bac6d6a299026756088f7604937,cbb4b26f93cfd9715ac9fa43440470df9395571b
Key: 37eedaaf317edb69029eed79f69dd479fb10bf08
Name: credential_private_encrypted_3DES.p12
Desc: 3DES encrypted P12 file from T6940
Pass: qeFGds84/Sf0eKkJwcp6
Cert: 20f65740b4a15bac6d6a299026756088f7604937,cbb4b26f93cfd9715ac9fa43440470df9395571b
Key: 37eedaaf317edb69029eed79f69dd479fb10bf08
# eof #

BIN
tests/cms/samplekeys/credential_private_encrypted_3DES.p12 Normal file
View file

Binary file not shown.

BIN
tests/cms/samplekeys/credential_private_encrypted_AES256.p12 Normal file
View file

Binary file not shown.