REGENERATE epan/dissectors/packet-pkinit.c => pushd epan/dissectors/asn1/pkinit ...
authorStefan Metzmacher <metze@samba.org>
Thu, 19 Apr 2018 22:26:12 +0000 (00:26 +0200)
committerStefan Metzmacher <metze@samba.org>
Sun, 20 Jan 2019 22:14:58 +0000 (23:14 +0100)
Change-Id: Ib6e099cc377ec8ca464b58b714271206967347d6

epan/dissectors/packet-pkinit.c

index f36b6f6..4e048ab 100644 (file)
@@ -114,7 +114,7 @@ static const value_string pkinit_TrustedCA_vals[] = {
 
 static const ber_choice_t TrustedCA_choice[] = {
   {   0, &hf_pkinit_caName       , BER_CLASS_CON, 0, 0, dissect_pkix1explicit_Name },
-  {   2, &hf_pkinit_issuerAndSerial, BER_CLASS_CON, 2, 0, dissect_CryptographicMessageSyntax_IssuerAndSerialNumber },
+  {   2, &hf_pkinit_issuerAndSerial, BER_CLASS_CON, 2, 0, dissect_cms_IssuerAndSerialNumber },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -142,9 +142,9 @@ dissect_pkinit_SEQUENCE_OF_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t PaPkAsReq_sequence[] = {
-  { &hf_pkinit_signedAuthPack, BER_CLASS_CON, 0, 0, dissect_CryptographicMessageSyntax_ContentInfo },
+  { &hf_pkinit_signedAuthPack, BER_CLASS_CON, 0, 0, dissect_cms_ContentInfo },
   { &hf_pkinit_trustedCertifiers, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_pkinit_SEQUENCE_OF_TrustedCA },
-  { &hf_pkinit_kdcCert      , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_CryptographicMessageSyntax_IssuerAndSerialNumber },
+  { &hf_pkinit_kdcCert      , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_cms_IssuerAndSerialNumber },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -273,8 +273,8 @@ const value_string pkinit_PaPkAsRep_vals[] = {
 };
 
 static const ber_choice_t PaPkAsRep_choice[] = {
-  {   0, &hf_pkinit_dhSignedData , BER_CLASS_CON, 0, 0, dissect_CryptographicMessageSyntax_ContentInfo },
-  {   1, &hf_pkinit_encKeyPack   , BER_CLASS_CON, 1, 0, dissect_CryptographicMessageSyntax_ContentInfo },
+  {   0, &hf_pkinit_dhSignedData , BER_CLASS_CON, 0, 0, dissect_cms_ContentInfo },
+  {   1, &hf_pkinit_encKeyPack   , BER_CLASS_CON, 1, 0, dissect_cms_ContentInfo },
   { 0, NULL, 0, 0, 0, NULL }
 };
 
@@ -344,7 +344,7 @@ dissect_pkinit_PKAuthenticator_Win2k(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 
 
 static const ber_sequence_t PA_PK_AS_REQ_Win2k_sequence[] = {
-  { &hf_pkinit_signed_auth_pack, BER_CLASS_CON, 0, 0, dissect_CryptographicMessageSyntax_ContentInfo },
+  { &hf_pkinit_signed_auth_pack, BER_CLASS_CON, 0, 0, dissect_cms_ContentInfo },
   { &hf_pkinit_trusted_certifiers, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_pkinit_SEQUENCE_OF_TrustedCA },
   { &hf_pkinit_kdc_cert     , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pkinit_OCTET_STRING },
   { &hf_pkinit_encryption_cert, BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pkinit_OCTET_STRING },