diff options
| author | Werner Koch <[email protected]> | 2024-01-26 08:41:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-01-26 08:41:00 +0000 |
| commit | dfa60c09f5cd992515df5fdb275dbee7f8f23b71 (patch) | |
| tree | e68215d4b947727fa98eb8c95244b8819b058b1e /tests | |
| parent | gpg: Clean up pk_ecdh_decrypt function. (diff) | |
| parent | Post release updates (diff) | |
| download | gnupg-dfa60c09f5cd992515df5fdb275dbee7f8f23b71.tar.gz gnupg-dfa60c09f5cd992515df5fdb275dbee7f8f23b71.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Fixed conflicts:
NEWS
configure.ac
doc/gpg.texi
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cms/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/cms/samplekeys/Description-p12 | 12 | ||||
| -rw-r--r-- | tests/cms/samplekeys/credential_private_encrypted_3DES.p12 | bin | 0 -> 4220 bytes | |||
| -rw-r--r-- | tests/cms/samplekeys/credential_private_encrypted_AES256.p12 | bin | 0 -> 4370 bytes |
4 files changed, 15 insertions, 0 deletions
diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am index b43fb1c91..f6a9c6099 100644 --- a/tests/cms/Makefile.am +++ b/tests/cms/Makefile.am @@ -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/[email protected] \ 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 \ diff --git a/tests/cms/samplekeys/Description-p12 b/tests/cms/samplekeys/Description-p12 index 01276087f..7d80caa1e 100644 --- a/tests/cms/samplekeys/Description-p12 +++ b/tests/cms/samplekeys/Description-p12 @@ -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 # diff --git a/tests/cms/samplekeys/credential_private_encrypted_3DES.p12 b/tests/cms/samplekeys/credential_private_encrypted_3DES.p12 Binary files differnew file mode 100644 index 000000000..58e80467d --- /dev/null +++ b/tests/cms/samplekeys/credential_private_encrypted_3DES.p12 diff --git a/tests/cms/samplekeys/credential_private_encrypted_AES256.p12 b/tests/cms/samplekeys/credential_private_encrypted_AES256.p12 Binary files differnew file mode 100644 index 000000000..ced504c85 --- /dev/null +++ b/tests/cms/samplekeys/credential_private_encrypted_AES256.p12 |