diff options
| author | Etienne Millon <etienne@cryptosense.com> | 2015-06-15 18:09:10 +0200 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2015-06-16 09:21:39 +0000 |
| commit | a0b0f37a627d4cb0efdd7ab18a9310c17ffb1a64 (patch) | |
| tree | fcd9e4562b1678ae0c769c6080bbfd024d5af82f /asn1 | |
| parent | c392db5b08b63adfeca86f84f76db19c829174ac (diff) | |
PKCS12: fix a duplicate OID
The value for OID 1.2.840.113549.1.12.1.6 was copy-pasted from the line above.
Its correct definition can be found in RFC7292, whose relevant parts are in
pkcs12.asn.
Note that the capitalization is not consistent in the RFC (pbeWith/pbewith).
I used the same convention.
Change-Id: I702c2b698660a7ea8df043775d37cadfa6d3ca72
Reviewed-on: https://code.wireshark.org/review/8928
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 17566a0d3c..19c7d43ce9 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -29,7 +29,7 @@ PBEParameter B "1.2.840.113549.1.12.1.2" "pbeWithSHAAnd40BitRC4" PBEParameter B "1.2.840.113549.1.12.1.3" "pbeWithSHAAnd3-KeyTripleDES-CBC" PBEParameter B "1.2.840.113549.1.12.1.4" "pbeWithSHAAnd2-KeyTripleDES-CBC" PBEParameter B "1.2.840.113549.1.12.1.5" "pbeWithSHAAnd128BitRC2-CBC" -PBEParameter B "1.2.840.113549.1.12.1.6" "pbeWithSHAAnd128BitRC2-CBC" +PBEParameter B "1.2.840.113549.1.12.1.6" "pbeWithSHAAnd40BitRC2-CBC" PBEParameter B "1.2.840.113549.1.5.1" "pbeWithMD2AndDES-CBC" PBEParameter B "1.2.840.113549.1.5.3" "pbeWithMD5AndDES-CBC" |