mirror of
git://git.gnupg.org/gnupg.git
synced 2024-10-30 19:58:44 +01:00
08f0b9ea2e
* sm/minip12.c (struct tlv_ctx_s): Add origbuffer and origbufsize. Remove pop_count. Rename offset to length. (dump_tag_info, _dump_tag_info): Rewrite. (dump_tlv_ctx, _dump_tlv_ctx): Rewrite. (tlv_new): Init origbuffer. (_tlv_peek): Add arg ti. (tlv_peek): New. (tlv_peek_null): New. (_tlv_push): Rewrite. (_tlv_pop): Rewrite. (tlv_next): New macro. Move old code to ... (_tlv_next): this. Add arg lno. Pop remaining end tags. (tlv_popped): Remove. (tlv_expect_object): Handle ndef. (tlv_expect_octet_string): Ditto. (parse_bag_encrypted_data): Use nesting level to control the inner loop. (parse_shrouded_key_bag): Likewise. (parse_bag_data): Handle surplus octet strings. (p12_parse): Ditto. * sm/minip12.c (decrypt_block): Strip the padding. (tlv_expect_top_sequence): Remove. Replace callers by tlv_expect_sequence. * tests/samplekeys/t6752-ov-user-ff.p12: New sample key. * tests/samplekeys/Description-p12: Add its description -- This patch improves the BER parser by simplifying it. Now tlv_next pops off and thus closes all containers regardless on whether they are length bounded or ndef. tlv_set_pending is now always used to undo the effect of a tlv_next in a loop condition which was terminated by a nesting level change. Instead of using the length as seen in the decrypted container we now remove the padding and let the BER parser do its work. This might have a negative effect on pkcs#12 objects which are not correctly padded but we don't have any example of such broken objects. GnuPG-bug-id: 6752
55 lines
1.7 KiB
Plaintext
55 lines
1.7 KiB
Plaintext
# Description-p12 - Machine readable description of our P12 test vectors
|
|
# The Cert line gives the SHA1 fingerprint of the certificate
|
|
# The Key line gives a hash of the key parameters as returned by minip12.c
|
|
|
|
Name: ov-user.p12
|
|
Desc: Private test key from www.openvalidation.org
|
|
Pass: start
|
|
Cert: 4753a910e0c8b4caa8663ca0e4273a884eb5397d
|
|
Key: 93be89edd11214ab74280d988a665b6beef876c5
|
|
|
|
Name: ov-server.p12
|
|
Desc: Private test key from www.openvalidation.org
|
|
Pass: start
|
|
Cert: 1997fadf6cc1af03e4845c4cba38fb2397315143
|
|
Key: 63b1d7233e75c3a462cb4b8ea3ad285e8ecba91c
|
|
|
|
Name: opensc-test.p12
|
|
Desc: PKCS#12 key and certificates taken from OpenSC (RC2+3DES,PKCS#8)
|
|
Pass: password
|
|
Cert: 115abfc3ae554092a57ade74177fedf9459af5d2
|
|
Cert: a0d6d318952c313ff8c33cd3f629647ff1de76b3
|
|
Key: 5a36c61706367ecdb52e8779e3a32bbac1069fa1
|
|
|
|
Name: t5793-openssl.pfx
|
|
Desc: self-signed key issued keys
|
|
Pass: test
|
|
Cert: 80348a438e4b803b99e708da0b7fdd0659dedd15
|
|
Key: c271e44ab4fb19ca1aae71102ea4d7292ccc981d
|
|
|
|
Name: t5793-test.pfx
|
|
Desc: QuaVadis format of t5793-openssl
|
|
Pass: test
|
|
Cert: 80348a438e4b803b99e708da0b7fdd0659dedd15
|
|
Key: c271e44ab4fb19ca1aae71102ea4d7292ccc981d
|
|
|
|
Name: edward.tester@demo.gnupg.com.p12
|
|
Desc: GnuPG exported Brainpool certificate
|
|
Pass: abc,123456
|
|
Cert: ff810b9281a43c394aa138e9c7fd4c0193216fa6
|
|
Key: 94c6d0b067370a8f2a09ae43cfe8d700bbd61e75
|
|
|
|
Name: nistp256-openssl-self-signed.p12
|
|
Desc: OpenSSL generated self-signed nistp256 key+cert
|
|
Pass: abc
|
|
Cert: 5cea0c5bf09ccd92535267c662fc098f6c81c27e
|
|
Key: 3cb2fba95d1976df69eb7aa8c65ac5354e15af32
|
|
|
|
Name: t6752-ov-user-ff.p12
|
|
Desc: Mozilla generated with a surplus octet string container
|
|
Pass: start
|
|
Cert: 4753a910e0c8b4caa8663ca0e4273a884eb5397d
|
|
Key: 93be89edd11214ab74280d988a665b6beef876c5
|
|
|
|
# eof #
|