diff options
Diffstat (limited to 'asn1/pkcs12/pkcs12.cnf')
| -rw-r--r-- | asn1/pkcs12/pkcs12.cnf | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf index 4a86238dc4..6e60b9bc3a 100644 --- a/asn1/pkcs12/pkcs12.cnf +++ b/asn1/pkcs12/pkcs12.cnf @@ -15,11 +15,11 @@ PKCS-5 x509af #.REGISTER -KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag" +KeyBag B "1.2.840.113549.1.12.10.1.1" "keyBag" PKCS8ShroudedKeyBag B "1.2.840.113549.1.12.10.1.2" "pkcs8ShroudedKeyBag" -CertBag B "1.2.840.113549.1.12.10.1.3" "certBag" -SecretBag B "1.2.840.113549.1.12.10.1.4" "secretBag" -CRLBag B "1.2.840.113549.1.12.10.1.5" "crlBag" +CertBag B "1.2.840.113549.1.12.10.1.3" "certBag" +SecretBag B "1.2.840.113549.1.12.10.1.4" "secretBag" +CRLBag B "1.2.840.113549.1.12.10.1.5" "crlBag" SafeContents B "1.2.840.113549.1.12.10.1.6" "safeContentsBag" # PKCS#9 Attributes - see master list in x509sat.cnf @@ -42,7 +42,7 @@ PBEParameter B "1.2.840.113549.1.5.10" "pbeWithSHA1AndDES-CBC" PBEParameter B "1.2.840.113549.1.5.11" "pbeWithSHA1AndRC2-CBC" PBKDF2Params B "1.2.840.113549.1.5.12" "id-PBKDF2" -PBES2Params B "1.2.840.113549.1.5.13" "id-PBES2" +PBES2Params B "1.2.840.113549.1.5.13" "id-PBES2" PBMAC1Params B "1.2.840.113549.1.5.14" "id-PBMAC1" #.NO_EMIT @@ -94,23 +94,23 @@ AuthenticatedSafe #.FN_BODY T_bagValue if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY T_attrValues_item if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY T_certValue if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY T_crlValue if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY T_secretValue if(object_identifier_id) - offset = call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset = call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.END |