-/* Do not modify this file. */
-/* It is created automatically by the ASN.1 to Wireshark dissector compiler */
+/* Do not modify this file. Changes will be overwritten. */
+/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-cms.c */
-/* ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn */
+/* ../../tools/asn2wrs.py -b -C -p cms -c ./cms.cnf -s ./packet-cms-template -D . -O ../../epan/dissectors CryptographicMessageSyntax.asn AttributeCertificateVersion1.asn */
/* Input file: packet-cms-template.c */
-#line 1 "packet-cms-template.c"
+#line 1 "../../asn1/cms/packet-cms-template.c"
/* packet-cms.c
- * Routines for RFC2630 Cryptographic Message Syntax packet dissection
+ * Routines for RFC5652 Cryptographic Message Syntax packet dissection
* Ronnie Sahlberg 2004
+ * Stig Bjorlykke 2010
*
* $Id$
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
#include <glib.h>
#include <epan/packet.h>
-#include <epan/conversation.h>
#include <epan/oids.h>
#include <epan/asn1.h>
-#include <stdio.h>
#include <string.h>
#include "packet-ber.h"
#include "packet-cms.h"
#include "packet-x509af.h"
+#include "packet-x509ce.h"
#include "packet-x509if.h"
+#include "packet-x509sat.h"
#include "packet-pkcs12.h"
-#include <epan/crypt/crypt-sha1.h>
-#include <epan/crypt/crypt-md5.h>
+#include <epan/crypt/sha1.h>
+#include <epan/crypt/md5.h>
#define PNAME "Cryptographic Message Syntax"
#define PSNAME "CMS"
#define PFNAME "cms"
/* Initialize the protocol and registered fields */
-int proto_cms = -1;
+static int proto_cms = -1;
static int hf_cms_ci_contentType = -1;
/*--- Included file: packet-cms-hf.c ---*/
-#line 1 "packet-cms-hf.c"
+#line 1 "../../asn1/cms/packet-cms-hf.c"
static int hf_cms_ContentInfo_PDU = -1; /* ContentInfo */
static int hf_cms_ContentType_PDU = -1; /* ContentType */
static int hf_cms_SignedData_PDU = -1; /* SignedData */
static int hf_cms_digestAlgorithms = -1; /* DigestAlgorithmIdentifiers */
static int hf_cms_encapContentInfo = -1; /* EncapsulatedContentInfo */
static int hf_cms_certificates = -1; /* CertificateSet */
-static int hf_cms_crls = -1; /* CertificateRevocationLists */
+static int hf_cms_crls = -1; /* RevocationInfoChoices */
static int hf_cms_signerInfos = -1; /* SignerInfos */
static int hf_cms_DigestAlgorithmIdentifiers_item = -1; /* DigestAlgorithmIdentifier */
static int hf_cms_SignerInfos_item = -1; /* SignerInfo */
static int hf_cms_ktri = -1; /* KeyTransRecipientInfo */
static int hf_cms_kari = -1; /* KeyAgreeRecipientInfo */
static int hf_cms_kekri = -1; /* KEKRecipientInfo */
+static int hf_cms_pwri = -1; /* PasswordRecipientInfo */
+static int hf_cms_ori = -1; /* OtherRecipientInfo */
static int hf_cms_rid = -1; /* RecipientIdentifier */
static int hf_cms_keyEncryptionAlgorithm = -1; /* KeyEncryptionAlgorithmIdentifier */
static int hf_cms_encryptedKey = -1; /* EncryptedKey */
static int hf_cms_other = -1; /* OtherKeyAttribute */
static int hf_cms_kekid = -1; /* KEKIdentifier */
static int hf_cms_keyIdentifier = -1; /* OCTET_STRING */
+static int hf_cms_keyDerivationAlgorithm = -1; /* KeyDerivationAlgorithmIdentifier */
+static int hf_cms_oriType = -1; /* T_oriType */
+static int hf_cms_oriValue = -1; /* T_oriValue */
static int hf_cms_digest = -1; /* Digest */
static int hf_cms_macAlgorithm = -1; /* MessageAuthenticationCodeAlgorithm */
-static int hf_cms_authenticatedAttributes = -1; /* AuthAttributes */
+static int hf_cms_authAttrs = -1; /* AuthAttributes */
static int hf_cms_mac = -1; /* MessageAuthenticationCode */
-static int hf_cms_unauthenticatedAttributes = -1; /* UnauthAttributes */
+static int hf_cms_unauthAttrs = -1; /* UnauthAttributes */
static int hf_cms_AuthAttributes_item = -1; /* Attribute */
static int hf_cms_UnauthAttributes_item = -1; /* Attribute */
-static int hf_cms_CertificateRevocationLists_item = -1; /* CertificateList */
+static int hf_cms_RevocationInfoChoices_item = -1; /* RevocationInfoChoice */
+static int hf_cms_crl = -1; /* CertificateList */
+static int hf_cms_otherRIC = -1; /* OtherRevocationInfoFormat */
+static int hf_cms_otherRevInfoFormat = -1; /* T_otherRevInfoFormat */
+static int hf_cms_otherRevInfo = -1; /* T_otherRevInfo */
static int hf_cms_certificate = -1; /* Certificate */
static int hf_cms_extendedCertificate = -1; /* ExtendedCertificate */
-static int hf_cms_attrCert = -1; /* AttributeCertificate */
+static int hf_cms_v1AttrCert = -1; /* AttributeCertificateV1 */
+static int hf_cms_v2AttrCert = -1; /* AttributeCertificateV2 */
static int hf_cms_CertificateSet_item = -1; /* CertificateChoices */
static int hf_cms_issuer = -1; /* Name */
static int hf_cms_serialNumber = -1; /* CertificateSerialNumber */
static int hf_cms_subjectAltKeyIdentifier = -1; /* SubjectKeyIdentifier */
static int hf_cms_rc2WrapParameter = -1; /* RC2WrapParameter */
static int hf_cms_rc2CBCParameter = -1; /* RC2CBCParameter */
+static int hf_cms_acInfo = -1; /* AttributeCertificateInfoV1 */
+static int hf_cms_signatureAlgorithm_v1 = -1; /* AlgorithmIdentifier */
+static int hf_cms_signatureValue_v1 = -1; /* BIT_STRING */
+static int hf_cms_version_v1 = -1; /* AttCertVersionV1 */
+static int hf_cms_subject = -1; /* T_subject */
+static int hf_cms_baseCertificateID = -1; /* IssuerSerial */
+static int hf_cms_subjectName = -1; /* GeneralNames */
+static int hf_cms_issuer_v1 = -1; /* GeneralNames */
+static int hf_cms_signature_v1 = -1; /* AlgorithmIdentifier */
+static int hf_cms_attCertValidityPeriod = -1; /* AttCertValidityPeriod */
+static int hf_cms_attributes_v1 = -1; /* SEQUENCE_OF_Attribute */
+static int hf_cms_attributes_v1_item = -1; /* Attribute */
+static int hf_cms_issuerUniqueID = -1; /* UniqueIdentifier */
+static int hf_cms_extensions = -1; /* Extensions */
/*--- End of included file: packet-cms-hf.c ---*/
-#line 56 "packet-cms-template.c"
+#line 55 "../../asn1/cms/packet-cms-template.c"
/* Initialize the subtree pointers */
/*--- Included file: packet-cms-ett.c ---*/
-#line 1 "packet-cms-ett.c"
+#line 1 "../../asn1/cms/packet-cms-ett.c"
static gint ett_cms_ContentInfo = -1;
static gint ett_cms_SignedData = -1;
static gint ett_cms_DigestAlgorithmIdentifiers = -1;
static gint ett_cms_RecipientKeyIdentifier = -1;
static gint ett_cms_KEKRecipientInfo = -1;
static gint ett_cms_KEKIdentifier = -1;
+static gint ett_cms_PasswordRecipientInfo = -1;
+static gint ett_cms_OtherRecipientInfo = -1;
static gint ett_cms_DigestedData = -1;
static gint ett_cms_EncryptedData = -1;
static gint ett_cms_AuthenticatedData = -1;
static gint ett_cms_AuthAttributes = -1;
static gint ett_cms_UnauthAttributes = -1;
-static gint ett_cms_CertificateRevocationLists = -1;
+static gint ett_cms_RevocationInfoChoices = -1;
+static gint ett_cms_RevocationInfoChoice = -1;
+static gint ett_cms_OtherRevocationInfoFormat = -1;
static gint ett_cms_CertificateChoices = -1;
static gint ett_cms_CertificateSet = -1;
static gint ett_cms_IssuerAndSerialNumber = -1;
static gint ett_cms_SMIMECapability = -1;
static gint ett_cms_SMIMEEncryptionKeyPreference = -1;
static gint ett_cms_RC2CBCParameters = -1;
+static gint ett_cms_AttributeCertificateV1 = -1;
+static gint ett_cms_AttributeCertificateInfoV1 = -1;
+static gint ett_cms_T_subject = -1;
+static gint ett_cms_SEQUENCE_OF_Attribute = -1;
/*--- End of included file: packet-cms-ett.c ---*/
-#line 59 "packet-cms-template.c"
+#line 58 "../../asn1/cms/packet-cms-template.c"
static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
/* compare our computed hash with what we have received */
if(tvb_bytes_exist(tvb, offset, buffer_size) &&
- (memcmp(tvb_get_ptr(tvb, offset, buffer_size), digest_buf, buffer_size) != 0)) {
+ (tvb_memeql(tvb, offset, digest_buf, buffer_size) != 0)) {
proto_item_append_text(pi, " [incorrect, should be ");
for(i = 0; i < buffer_size; i++)
proto_item_append_text(pi, "%02X", digest_buf[i]);
/*--- Included file: packet-cms-fn.c ---*/
-#line 1 "packet-cms-fn.c"
+#line 1 "../../asn1/cms/packet-cms-fn.c"
int
dissect_cms_ContentType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 77 "cms.cnf"
+#line 90 "../../asn1/cms/cms.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
- if(object_identifier_id) {
+ if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
- proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id);
+ proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id);
}
static int
dissect_cms_T_content(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 87 "cms.cnf"
+#line 100 "../../asn1/cms/cms.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
int
dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 68 "cms.cnf"
+#line 81 "../../asn1/cms/cms.cnf"
top_tree = tree;
offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
{ 2, "v2" },
{ 3, "v3" },
{ 4, "v4" },
+ { 5, "v5" },
{ 0, NULL }
};
static int
dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 91 "cms.cnf"
- gint8 class;
- gboolean pc, ind;
- gint32 tag;
- guint32 len;
- int pdu_offset = offset;
- int content_offset;
+#line 104 "../../asn1/cms/cms.cnf"
- /* XXX Do we care about printing out the octet string? */
- offset = dissect_cms_OCTET_STRING(FALSE, tvb, offset, actx, NULL, hf_cms_eContent);
+ offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &content_tvb);
+ proto_item_set_text(actx->created_item, "eContent (%u bytes)", tvb_length (content_tvb));
- pdu_offset = get_ber_identifier(tvb, pdu_offset, &class, &pc, &tag);
- content_offset = pdu_offset = get_ber_length(tvb, pdu_offset, &len, &ind);
- pdu_offset = call_ber_oid_callback(object_identifier_id, tvb, pdu_offset, actx->pinfo, top_tree ? top_tree : tree);
-
- /* save the content for checking the message digest */
- content_tvb = tvb_new_subset(tvb, content_offset, len, -1);
+ call_ber_oid_callback(object_identifier_id, content_tvb, 0, actx->pinfo, top_tree ? top_tree : tree);
static int
dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 119 "cms.cnf"
+#line 131 "../../asn1/cms/cms.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
- proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id);
+ proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id);
}
static int
dissect_cms_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 129 "cms.cnf"
+#line 141 "../../asn1/cms/cms.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
static int
dissect_cms_UnauthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, UnauthAttributes_set_of, hf_index, ett_cms_UnauthAttributes);
return offset;
}
}
+static const value_string cms_AttCertVersionV1_vals[] = {
+ { 0, "v1" },
+ { 0, NULL }
+};
+
+
+static int
+dissect_cms_AttCertVersionV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
+ NULL);
+
+ return offset;
+}
+
+
+static const value_string cms_T_subject_vals[] = {
+ { 0, "baseCertificateID" },
+ { 1, "subjectName" },
+ { 0, NULL }
+};
+
+static const ber_choice_t T_subject_choice[] = {
+ { 0, &hf_cms_baseCertificateID, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_x509af_IssuerSerial },
+ { 1, &hf_cms_subjectName , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x509ce_GeneralNames },
+ { 0, NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_T_subject(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_choice(actx, tree, tvb, offset,
+ T_subject_choice, hf_index, ett_cms_T_subject,
+ NULL);
+
+ return offset;
+}
+
+
+static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
+ { &hf_cms_attributes_v1_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_Attribute },
+};
+
+static int
+dissect_cms_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
+ SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_cms_SEQUENCE_OF_Attribute);
+
+ return offset;
+}
+
+
+static const ber_sequence_t AttributeCertificateInfoV1_sequence[] = {
+ { &hf_cms_version_v1 , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cms_AttCertVersionV1 },
+ { &hf_cms_subject , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_cms_T_subject },
+ { &hf_cms_issuer_v1 , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509ce_GeneralNames },
+ { &hf_cms_signature_v1 , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_AlgorithmIdentifier },
+ { &hf_cms_serialNumber , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_x509af_CertificateSerialNumber },
+ { &hf_cms_attCertValidityPeriod, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_AttCertValidityPeriod },
+ { &hf_cms_attributes_v1 , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_SEQUENCE_OF_Attribute },
+ { &hf_cms_issuerUniqueID , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x509sat_UniqueIdentifier },
+ { &hf_cms_extensions , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_x509af_Extensions },
+ { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_AttributeCertificateInfoV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+ AttributeCertificateInfoV1_sequence, hf_index, ett_cms_AttributeCertificateInfoV1);
+
+ return offset;
+}
+
+
+
+static int
+dissect_cms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
+ NULL, hf_index, -1,
+ NULL);
+
+ return offset;
+}
+
+
+static const ber_sequence_t AttributeCertificateV1_sequence[] = {
+ { &hf_cms_acInfo , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_AttributeCertificateInfoV1 },
+ { &hf_cms_signatureAlgorithm_v1, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_AlgorithmIdentifier },
+ { &hf_cms_signatureValue_v1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_cms_BIT_STRING },
+ { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_AttributeCertificateV1(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+ AttributeCertificateV1_sequence, hf_index, ett_cms_AttributeCertificateV1);
+
+ return offset;
+}
+
+
+
+static int
+dissect_cms_AttributeCertificateV2(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_x509af_AttributeCertificate(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+ return offset;
+}
+
+
static const value_string cms_CertificateChoices_vals[] = {
{ 0, "certificate" },
{ 1, "extendedCertificate" },
- { 2, "attrCert" },
+ { 2, "v1AttrCert" },
+ { 3, "v2AttrCert" },
{ 0, NULL }
};
static const ber_choice_t CertificateChoices_choice[] = {
{ 0, &hf_cms_certificate , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_Certificate },
{ 1, &hf_cms_extendedCertificate, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cms_ExtendedCertificate },
- { 2, &hf_cms_attrCert , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_x509af_AttributeCertificate },
+ { 2, &hf_cms_v1AttrCert , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cms_AttributeCertificateV1 },
+ { 3, &hf_cms_v2AttrCert , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cms_AttributeCertificateV2 },
{ 0, NULL, 0, 0, 0, NULL }
};
}
-static const ber_sequence_t CertificateRevocationLists_set_of[1] = {
- { &hf_cms_CertificateRevocationLists_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_CertificateList },
+
+static int
+dissect_cms_T_otherRevInfoFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
+
+ return offset;
+}
+
+
+
+static int
+dissect_cms_T_otherRevInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 125 "../../asn1/cms/cms.cnf"
+ offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+
+
+ return offset;
+}
+
+
+static const ber_sequence_t OtherRevocationInfoFormat_sequence[] = {
+ { &hf_cms_otherRevInfoFormat, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_cms_T_otherRevInfoFormat },
+ { &hf_cms_otherRevInfo , BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_cms_T_otherRevInfo },
+ { NULL, 0, 0, 0, NULL }
};
static int
-dissect_cms_CertificateRevocationLists(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_cms_OtherRevocationInfoFormat(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+ OtherRevocationInfoFormat_sequence, hf_index, ett_cms_OtherRevocationInfoFormat);
+
+ return offset;
+}
+
+
+static const value_string cms_RevocationInfoChoice_vals[] = {
+ { 0, "crl" },
+ { 1, "other" },
+ { 0, NULL }
+};
+
+static const ber_choice_t RevocationInfoChoice_choice[] = {
+ { 0, &hf_cms_crl , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_CertificateList },
+ { 1, &hf_cms_otherRIC , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cms_OtherRevocationInfoFormat },
+ { 0, NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_RevocationInfoChoice(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_choice(actx, tree, tvb, offset,
+ RevocationInfoChoice_choice, hf_index, ett_cms_RevocationInfoChoice,
+ NULL);
+
+ return offset;
+}
+
+
+static const ber_sequence_t RevocationInfoChoices_set_of[1] = {
+ { &hf_cms_RevocationInfoChoices_item, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_cms_RevocationInfoChoice },
+};
+
+static int
+dissect_cms_RevocationInfoChoices(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- CertificateRevocationLists_set_of, hf_index, ett_cms_CertificateRevocationLists);
+ RevocationInfoChoices_set_of, hf_index, ett_cms_RevocationInfoChoices);
return offset;
}
int
dissect_cms_SignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, SignedAttributes_set_of, hf_index, ett_cms_SignedAttributes);
return offset;
}
int
dissect_cms_UnsignedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, UnsignedAttributes_set_of, hf_index, ett_cms_UnsignedAttributes);
return offset;
}
{ &hf_cms_digestAlgorithms, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_cms_DigestAlgorithmIdentifiers },
{ &hf_cms_encapContentInfo, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_EncapsulatedContentInfo },
{ &hf_cms_certificates , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_CertificateSet },
- { &hf_cms_crls , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_CertificateRevocationLists },
+ { &hf_cms_crls , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_RevocationInfoChoices },
{ &hf_cms_signerInfos , BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_cms_SignerInfos },
{ NULL, 0, 0, 0, NULL }
};
static const ber_sequence_t OriginatorInfo_sequence[] = {
{ &hf_cms_certs , BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_CertificateSet },
- { &hf_cms_crls , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_CertificateRevocationLists },
+ { &hf_cms_crls , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_RevocationInfoChoices },
{ NULL, 0, 0, 0, NULL }
};
}
-
-static int
-dissect_cms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
- NULL, hf_index, -1,
- NULL);
-
- return offset;
-}
-
-
static const ber_sequence_t OriginatorPublicKey_sequence[] = {
{ &hf_cms_algorithm , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_x509af_AlgorithmIdentifier },
{ &hf_cms_publicKey , BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_cms_BIT_STRING },
static int
dissect_cms_T_keyAttr(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 112 "cms.cnf"
+#line 120 "../../asn1/cms/cms.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
-
-
return offset;
}
}
+
+static int
+dissect_cms_KeyDerivationAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, actx, tree, hf_index);
+
+ return offset;
+}
+
+
+static const ber_sequence_t PasswordRecipientInfo_sequence[] = {
+ { &hf_cms_version , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_cms_CMSVersion },
+ { &hf_cms_keyDerivationAlgorithm, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_KeyDerivationAlgorithmIdentifier },
+ { &hf_cms_keyEncryptionAlgorithm, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_KeyEncryptionAlgorithmIdentifier },
+ { &hf_cms_encryptedKey , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cms_EncryptedKey },
+ { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_PasswordRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+ PasswordRecipientInfo_sequence, hf_index, ett_cms_PasswordRecipientInfo);
+
+ return offset;
+}
+
+
+
+static int
+dissect_cms_T_oriType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &object_identifier_id);
+
+ return offset;
+}
+
+
+
+static int
+dissect_cms_T_oriValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+#line 114 "../../asn1/cms/cms.cnf"
+ offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
+
+
+
+ return offset;
+}
+
+
+static const ber_sequence_t OtherRecipientInfo_sequence[] = {
+ { &hf_cms_oriType , BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_cms_T_oriType },
+ { &hf_cms_oriValue , BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_cms_T_oriValue },
+ { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_cms_OtherRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+ offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
+ OtherRecipientInfo_sequence, hf_index, ett_cms_OtherRecipientInfo);
+
+ return offset;
+}
+
+
static const value_string cms_RecipientInfo_vals[] = {
{ 0, "ktri" },
{ 1, "kari" },
{ 2, "kekri" },
+ { 3, "pwri" },
+ { 4, "ori" },
{ 0, NULL }
};
{ 0, &hf_cms_ktri , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_KeyTransRecipientInfo },
{ 1, &hf_cms_kari , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cms_KeyAgreeRecipientInfo },
{ 2, &hf_cms_kekri , BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_cms_KEKRecipientInfo },
+ { 3, &hf_cms_pwri , BER_CLASS_CON, 3, BER_FLAGS_IMPLTAG, dissect_cms_PasswordRecipientInfo },
+ { 4, &hf_cms_ori , BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_cms_OtherRecipientInfo },
{ 0, NULL, 0, 0, 0, NULL }
};
static int
dissect_cms_RecipientInfos(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, RecipientInfos_set_of, hf_index, ett_cms_RecipientInfos);
return offset;
}
static int
dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 179 "cms.cnf"
+#line 191 "../../asn1/cms/cms.cnf"
tvbuff_t *encrypted_tvb;
proto_item *item;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
&encrypted_tvb);
-#line 184 "cms.cnf"
+#line 196 "../../asn1/cms/cms.cnf"
item = actx->created_item;
static int
dissect_cms_UnprotectedAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, UnprotectedAttributes_set_of, hf_index, ett_cms_UnprotectedAttributes);
return offset;
}
static int
dissect_cms_AuthAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_set_of(implicit_tag, actx, tree, tvb, offset,
- AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
+ offset = dissect_ber_constrained_set_of(implicit_tag, actx, tree, tvb, offset,
+ 1, NO_BOUND, AuthAttributes_set_of, hf_index, ett_cms_AuthAttributes);
return offset;
}
{ &hf_cms_macAlgorithm , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_MessageAuthenticationCodeAlgorithm },
{ &hf_cms_digestAlgorithm , BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_DigestAlgorithmIdentifier },
{ &hf_cms_encapContentInfo, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_EncapsulatedContentInfo },
- { &hf_cms_authenticatedAttributes, BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_AuthAttributes },
+ { &hf_cms_authAttrs , BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_AuthAttributes },
{ &hf_cms_mac , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cms_MessageAuthenticationCode },
- { &hf_cms_unauthenticatedAttributes, BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_UnauthAttributes },
+ { &hf_cms_unauthAttrs , BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cms_UnauthAttributes },
{ NULL, 0, 0, 0, NULL }
};
static int
dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 133 "cms.cnf"
+#line 145 "../../asn1/cms/cms.cnf"
proto_item *pi;
int old_offset = offset;
old_offset = get_ber_identifier(tvb, old_offset, NULL, NULL, NULL);
old_offset = get_ber_length(tvb, old_offset, NULL, NULL);
- if(content_tvb)
+ if(content_tvb)
cms_verify_msg_digest(pi, content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset);
static int
dissect_cms_UTCTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
- offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime,
- actx, tree, tvb, offset, hf_index,
- NULL);
+ offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index);
return offset;
}
static int
dissect_cms_RC2ParameterVersion(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 169 "cms.cnf"
+#line 181 "../../asn1/cms/cms.cnf"
guint32 length = 0;
offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
&length);
- if(cap_tree != NULL)
- proto_item_append_text(cap_tree, " (%d bits)", length);
+ if(cap_tree != NULL)
+ proto_item_append_text(cap_tree, " (%d bits)", length);
static int
dissect_cms_T_capability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 151 "cms.cnf"
+#line 163 "../../asn1/cms/cms.cnf"
const char *name = NULL;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_cms_attrType, &object_identifier_id);
if(object_identifier_id) {
name = oid_resolved_from_string(object_identifier_id);
- proto_item_append_text(tree, " %s", name ? name : object_identifier_id);
+ proto_item_append_text(tree, " %s", name ? name : object_identifier_id);
cap_tree = tree;
}
static int
dissect_cms_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 162 "cms.cnf"
+#line 174 "../../asn1/cms/cms.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
/*--- End of included file: packet-cms-fn.c ---*/
-#line 137 "packet-cms-template.c"
+#line 136 "../../asn1/cms/packet-cms-template.c"
/*--- proto_register_cms ----------------------------------------------*/
void proto_register_cms(void) {
{ &hf_cms_ci_contentType,
{ "contentType", "cms.contentInfo.contentType",
FT_OID, BASE_NONE, NULL, 0,
- "ContentType", HFILL }},
+ NULL, HFILL }},
/*--- Included file: packet-cms-hfarr.c ---*/
-#line 1 "packet-cms-hfarr.c"
+#line 1 "../../asn1/cms/packet-cms-hfarr.c"
{ &hf_cms_ContentInfo_PDU,
- { "ContentInfo", "cms.ContentInfo",
+ { "ContentInfo", "cms.ContentInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.ContentInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_ContentType_PDU,
{ "ContentType", "cms.ContentType",
FT_OID, BASE_NONE, NULL, 0,
- "cms.ContentType", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_SignedData_PDU,
- { "SignedData", "cms.SignedData",
+ { "SignedData", "cms.SignedData_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.SignedData", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_EnvelopedData_PDU,
- { "EnvelopedData", "cms.EnvelopedData",
+ { "EnvelopedData", "cms.EnvelopedData_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.EnvelopedData", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_DigestedData_PDU,
- { "DigestedData", "cms.DigestedData",
+ { "DigestedData", "cms.DigestedData_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.DigestedData", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_EncryptedData_PDU,
- { "EncryptedData", "cms.EncryptedData",
+ { "EncryptedData", "cms.EncryptedData_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.EncryptedData", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_AuthenticatedData_PDU,
- { "AuthenticatedData", "cms.AuthenticatedData",
+ { "AuthenticatedData", "cms.AuthenticatedData_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.AuthenticatedData", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_IssuerAndSerialNumber_PDU,
- { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber",
+ { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.IssuerAndSerialNumber", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_MessageDigest_PDU,
{ "MessageDigest", "cms.MessageDigest",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.MessageDigest", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_SigningTime_PDU,
{ "SigningTime", "cms.SigningTime",
- FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
- "cms.SigningTime", HFILL }},
+ FT_UINT32, BASE_DEC, VALS(cms_Time_vals), 0,
+ NULL, HFILL }},
{ &hf_cms_Countersignature_PDU,
- { "Countersignature", "cms.Countersignature",
+ { "Countersignature", "cms.Countersignature_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Countersignature", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_RC2WrapParameter_PDU,
{ "RC2WrapParameter", "cms.RC2WrapParameter",
FT_INT32, BASE_DEC, NULL, 0,
- "cms.RC2WrapParameter", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_SMIMECapabilities_PDU,
{ "SMIMECapabilities", "cms.SMIMECapabilities",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.SMIMECapabilities", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_SMIMEEncryptionKeyPreference_PDU,
{ "SMIMEEncryptionKeyPreference", "cms.SMIMEEncryptionKeyPreference",
FT_UINT32, BASE_DEC, VALS(cms_SMIMEEncryptionKeyPreference_vals), 0,
- "cms.SMIMEEncryptionKeyPreference", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_RC2CBCParameters_PDU,
{ "RC2CBCParameters", "cms.RC2CBCParameters",
FT_UINT32, BASE_DEC, VALS(cms_RC2CBCParameters_vals), 0,
- "cms.RC2CBCParameters", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_contentType,
{ "contentType", "cms.contentType",
FT_OID, BASE_NONE, NULL, 0,
- "cms.ContentType", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_content,
- { "content", "cms.content",
+ { "content", "cms.content_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.T_content", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_version,
{ "version", "cms.version",
FT_INT32, BASE_DEC, VALS(cms_CMSVersion_vals), 0,
- "cms.CMSVersion", HFILL }},
+ "CMSVersion", HFILL }},
{ &hf_cms_digestAlgorithms,
{ "digestAlgorithms", "cms.digestAlgorithms",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.DigestAlgorithmIdentifiers", HFILL }},
+ "DigestAlgorithmIdentifiers", HFILL }},
{ &hf_cms_encapContentInfo,
- { "encapContentInfo", "cms.encapContentInfo",
+ { "encapContentInfo", "cms.encapContentInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.EncapsulatedContentInfo", HFILL }},
+ "EncapsulatedContentInfo", HFILL }},
{ &hf_cms_certificates,
{ "certificates", "cms.certificates",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.CertificateSet", HFILL }},
+ "CertificateSet", HFILL }},
{ &hf_cms_crls,
{ "crls", "cms.crls",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.CertificateRevocationLists", HFILL }},
+ "RevocationInfoChoices", HFILL }},
{ &hf_cms_signerInfos,
{ "signerInfos", "cms.signerInfos",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.SignerInfos", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_DigestAlgorithmIdentifiers_item,
- { "Item", "cms.DigestAlgorithmIdentifiers_item",
+ { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.DigestAlgorithmIdentifier", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_SignerInfos_item,
- { "Item", "cms.SignerInfos_item",
+ { "SignerInfo", "cms.SignerInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.SignerInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_eContentType,
{ "eContentType", "cms.eContentType",
FT_OID, BASE_NONE, NULL, 0,
- "cms.ContentType", HFILL }},
+ "ContentType", HFILL }},
{ &hf_cms_eContent,
{ "eContent", "cms.eContent",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.T_eContent", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_sid,
{ "sid", "cms.sid",
FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0,
- "cms.SignerIdentifier", HFILL }},
+ "SignerIdentifier", HFILL }},
{ &hf_cms_digestAlgorithm,
- { "digestAlgorithm", "cms.digestAlgorithm",
+ { "digestAlgorithm", "cms.digestAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.DigestAlgorithmIdentifier", HFILL }},
+ "DigestAlgorithmIdentifier", HFILL }},
{ &hf_cms_signedAttrs,
{ "signedAttrs", "cms.signedAttrs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.SignedAttributes", HFILL }},
+ "SignedAttributes", HFILL }},
{ &hf_cms_signatureAlgorithm,
- { "signatureAlgorithm", "cms.signatureAlgorithm",
+ { "signatureAlgorithm", "cms.signatureAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.SignatureAlgorithmIdentifier", HFILL }},
+ "SignatureAlgorithmIdentifier", HFILL }},
{ &hf_cms_signatureValue,
{ "signature", "cms.signature",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.SignatureValue", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "SignatureValue", HFILL }},
{ &hf_cms_unsignedAttrs,
{ "unsignedAttrs", "cms.unsignedAttrs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.UnsignedAttributes", HFILL }},
+ "UnsignedAttributes", HFILL }},
{ &hf_cms_issuerAndSerialNumber,
- { "issuerAndSerialNumber", "cms.issuerAndSerialNumber",
+ { "issuerAndSerialNumber", "cms.issuerAndSerialNumber_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.IssuerAndSerialNumber", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_subjectKeyIdentifier,
{ "subjectKeyIdentifier", "cms.subjectKeyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.SubjectKeyIdentifier", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_SignedAttributes_item,
- { "Item", "cms.SignedAttributes_item",
+ { "Attribute", "cms.Attribute_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Attribute", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_UnsignedAttributes_item,
- { "Item", "cms.UnsignedAttributes_item",
+ { "Attribute", "cms.Attribute_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Attribute", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_attrType,
{ "attrType", "cms.attrType",
FT_OID, BASE_NONE, NULL, 0,
- "cms.T_attrType", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_attrValues,
{ "attrValues", "cms.attrValues",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.SET_OF_AttributeValue", HFILL }},
+ "SET_OF_AttributeValue", HFILL }},
{ &hf_cms_attrValues_item,
- { "Item", "cms.attrValues_item",
+ { "AttributeValue", "cms.AttributeValue_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.AttributeValue", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_originatorInfo,
- { "originatorInfo", "cms.originatorInfo",
+ { "originatorInfo", "cms.originatorInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.OriginatorInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_recipientInfos,
{ "recipientInfos", "cms.recipientInfos",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.RecipientInfos", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_encryptedContentInfo,
- { "encryptedContentInfo", "cms.encryptedContentInfo",
+ { "encryptedContentInfo", "cms.encryptedContentInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.EncryptedContentInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_unprotectedAttrs,
{ "unprotectedAttrs", "cms.unprotectedAttrs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.UnprotectedAttributes", HFILL }},
+ "UnprotectedAttributes", HFILL }},
{ &hf_cms_certs,
{ "certs", "cms.certs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.CertificateSet", HFILL }},
+ "CertificateSet", HFILL }},
{ &hf_cms_RecipientInfos_item,
- { "Item", "cms.RecipientInfos_item",
+ { "RecipientInfo", "cms.RecipientInfo",
FT_UINT32, BASE_DEC, VALS(cms_RecipientInfo_vals), 0,
- "cms.RecipientInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_encryptedContentType,
{ "contentType", "cms.contentType",
FT_OID, BASE_NONE, NULL, 0,
- "cms.ContentType", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_contentEncryptionAlgorithm,
- { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm",
+ { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.ContentEncryptionAlgorithmIdentifier", HFILL }},
+ "ContentEncryptionAlgorithmIdentifier", HFILL }},
{ &hf_cms_encryptedContent,
{ "encryptedContent", "cms.encryptedContent",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.EncryptedContent", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_UnprotectedAttributes_item,
- { "Item", "cms.UnprotectedAttributes_item",
+ { "Attribute", "cms.Attribute_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Attribute", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_ktri,
- { "ktri", "cms.ktri",
+ { "ktri", "cms.ktri_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.KeyTransRecipientInfo", HFILL }},
+ "KeyTransRecipientInfo", HFILL }},
{ &hf_cms_kari,
- { "kari", "cms.kari",
+ { "kari", "cms.kari_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.KeyAgreeRecipientInfo", HFILL }},
+ "KeyAgreeRecipientInfo", HFILL }},
{ &hf_cms_kekri,
- { "kekri", "cms.kekri",
+ { "kekri", "cms.kekri_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "KEKRecipientInfo", HFILL }},
+ { &hf_cms_pwri,
+ { "pwri", "cms.pwri_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "PasswordRecipientInfo", HFILL }},
+ { &hf_cms_ori,
+ { "ori", "cms.ori_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.KEKRecipientInfo", HFILL }},
+ "OtherRecipientInfo", HFILL }},
{ &hf_cms_rid,
{ "rid", "cms.rid",
FT_UINT32, BASE_DEC, VALS(cms_RecipientIdentifier_vals), 0,
- "cms.RecipientIdentifier", HFILL }},
+ "RecipientIdentifier", HFILL }},
{ &hf_cms_keyEncryptionAlgorithm,
- { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm",
+ { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.KeyEncryptionAlgorithmIdentifier", HFILL }},
+ "KeyEncryptionAlgorithmIdentifier", HFILL }},
{ &hf_cms_encryptedKey,
{ "encryptedKey", "cms.encryptedKey",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.EncryptedKey", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_originator,
{ "originator", "cms.originator",
FT_UINT32, BASE_DEC, VALS(cms_OriginatorIdentifierOrKey_vals), 0,
- "cms.OriginatorIdentifierOrKey", HFILL }},
+ "OriginatorIdentifierOrKey", HFILL }},
{ &hf_cms_ukm,
{ "ukm", "cms.ukm",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.UserKeyingMaterial", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "UserKeyingMaterial", HFILL }},
{ &hf_cms_recipientEncryptedKeys,
{ "recipientEncryptedKeys", "cms.recipientEncryptedKeys",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.RecipientEncryptedKeys", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_originatorKey,
- { "originatorKey", "cms.originatorKey",
+ { "originatorKey", "cms.originatorKey_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.OriginatorPublicKey", HFILL }},
+ "OriginatorPublicKey", HFILL }},
{ &hf_cms_algorithm,
- { "algorithm", "cms.algorithm",
+ { "algorithm", "cms.algorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "x509af.AlgorithmIdentifier", HFILL }},
+ "AlgorithmIdentifier", HFILL }},
{ &hf_cms_publicKey,
{ "publicKey", "cms.publicKey",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.BIT_STRING", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING", HFILL }},
{ &hf_cms_RecipientEncryptedKeys_item,
- { "Item", "cms.RecipientEncryptedKeys_item",
+ { "RecipientEncryptedKey", "cms.RecipientEncryptedKey_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.RecipientEncryptedKey", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_rekRid,
{ "rid", "cms.rid",
FT_UINT32, BASE_DEC, VALS(cms_KeyAgreeRecipientIdentifier_vals), 0,
- "cms.KeyAgreeRecipientIdentifier", HFILL }},
+ "KeyAgreeRecipientIdentifier", HFILL }},
{ &hf_cms_rKeyId,
- { "rKeyId", "cms.rKeyId",
+ { "rKeyId", "cms.rKeyId_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.RecipientKeyIdentifier", HFILL }},
+ "RecipientKeyIdentifier", HFILL }},
{ &hf_cms_date,
{ "date", "cms.date",
FT_STRING, BASE_NONE, NULL, 0,
- "cms.GeneralizedTime", HFILL }},
+ "GeneralizedTime", HFILL }},
{ &hf_cms_other,
- { "other", "cms.other",
+ { "other", "cms.other_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.OtherKeyAttribute", HFILL }},
+ "OtherKeyAttribute", HFILL }},
{ &hf_cms_kekid,
- { "kekid", "cms.kekid",
+ { "kekid", "cms.kekid_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.KEKIdentifier", HFILL }},
+ "KEKIdentifier", HFILL }},
{ &hf_cms_keyIdentifier,
{ "keyIdentifier", "cms.keyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.OCTET_STRING", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "OCTET_STRING", HFILL }},
+ { &hf_cms_keyDerivationAlgorithm,
+ { "keyDerivationAlgorithm", "cms.keyDerivationAlgorithm_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "KeyDerivationAlgorithmIdentifier", HFILL }},
+ { &hf_cms_oriType,
+ { "oriType", "cms.oriType",
+ FT_OID, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_cms_oriValue,
+ { "oriValue", "cms.oriValue_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_digest,
{ "digest", "cms.digest",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.Digest", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_macAlgorithm,
- { "macAlgorithm", "cms.macAlgorithm",
+ { "macAlgorithm", "cms.macAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.MessageAuthenticationCodeAlgorithm", HFILL }},
- { &hf_cms_authenticatedAttributes,
- { "authenticatedAttributes", "cms.authenticatedAttributes",
+ "MessageAuthenticationCodeAlgorithm", HFILL }},
+ { &hf_cms_authAttrs,
+ { "authAttrs", "cms.authAttrs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.AuthAttributes", HFILL }},
+ "AuthAttributes", HFILL }},
{ &hf_cms_mac,
{ "mac", "cms.mac",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.MessageAuthenticationCode", HFILL }},
- { &hf_cms_unauthenticatedAttributes,
- { "unauthenticatedAttributes", "cms.unauthenticatedAttributes",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "MessageAuthenticationCode", HFILL }},
+ { &hf_cms_unauthAttrs,
+ { "unauthAttrs", "cms.unauthAttrs",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.UnauthAttributes", HFILL }},
+ "UnauthAttributes", HFILL }},
{ &hf_cms_AuthAttributes_item,
- { "Item", "cms.AuthAttributes_item",
+ { "Attribute", "cms.Attribute_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Attribute", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_UnauthAttributes_item,
- { "Item", "cms.UnauthAttributes_item",
+ { "Attribute", "cms.Attribute_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.Attribute", HFILL }},
- { &hf_cms_CertificateRevocationLists_item,
- { "Item", "cms.CertificateRevocationLists_item",
+ NULL, HFILL }},
+ { &hf_cms_RevocationInfoChoices_item,
+ { "RevocationInfoChoice", "cms.RevocationInfoChoice",
+ FT_UINT32, BASE_DEC, VALS(cms_RevocationInfoChoice_vals), 0,
+ NULL, HFILL }},
+ { &hf_cms_crl,
+ { "crl", "cms.crl_element",
FT_NONE, BASE_NONE, NULL, 0,
- "x509af.CertificateList", HFILL }},
+ "CertificateList", HFILL }},
+ { &hf_cms_otherRIC,
+ { "other", "cms.other_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "OtherRevocationInfoFormat", HFILL }},
+ { &hf_cms_otherRevInfoFormat,
+ { "otherRevInfoFormat", "cms.otherRevInfoFormat",
+ FT_OID, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_cms_otherRevInfo,
+ { "otherRevInfo", "cms.otherRevInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_certificate,
- { "certificate", "cms.certificate",
+ { "certificate", "cms.certificate_element",
FT_NONE, BASE_NONE, NULL, 0,
- "x509af.Certificate", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_extendedCertificate,
- { "extendedCertificate", "cms.extendedCertificate",
+ { "extendedCertificate", "cms.extendedCertificate_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.ExtendedCertificate", HFILL }},
- { &hf_cms_attrCert,
- { "attrCert", "cms.attrCert",
+ NULL, HFILL }},
+ { &hf_cms_v1AttrCert,
+ { "v1AttrCert", "cms.v1AttrCert_element",
FT_NONE, BASE_NONE, NULL, 0,
- "x509af.AttributeCertificate", HFILL }},
+ "AttributeCertificateV1", HFILL }},
+ { &hf_cms_v2AttrCert,
+ { "v2AttrCert", "cms.v2AttrCert_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "AttributeCertificateV2", HFILL }},
{ &hf_cms_CertificateSet_item,
- { "Item", "cms.CertificateSet_item",
+ { "CertificateChoices", "cms.CertificateChoices",
FT_UINT32, BASE_DEC, VALS(cms_CertificateChoices_vals), 0,
- "cms.CertificateChoices", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_issuer,
{ "issuer", "cms.issuer",
FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
- "x509if.Name", HFILL }},
+ "Name", HFILL }},
{ &hf_cms_serialNumber,
{ "serialNumber", "cms.serialNumber",
FT_INT32, BASE_DEC, NULL, 0,
- "x509af.CertificateSerialNumber", HFILL }},
+ "CertificateSerialNumber", HFILL }},
{ &hf_cms_keyAttrId,
{ "keyAttrId", "cms.keyAttrId",
FT_OID, BASE_NONE, NULL, 0,
- "cms.T_keyAttrId", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_keyAttr,
- { "keyAttr", "cms.keyAttr",
+ { "keyAttr", "cms.keyAttr_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.T_keyAttr", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_utcTime,
{ "utcTime", "cms.utcTime",
FT_STRING, BASE_NONE, NULL, 0,
- "cms.UTCTime", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_generalTime,
{ "generalTime", "cms.generalTime",
FT_STRING, BASE_NONE, NULL, 0,
- "cms.GeneralizedTime", HFILL }},
+ "GeneralizedTime", HFILL }},
{ &hf_cms_rc2ParameterVersion,
{ "rc2ParameterVersion", "cms.rc2ParameterVersion",
FT_INT32, BASE_DEC, NULL, 0,
- "cms.INTEGER", HFILL }},
+ "INTEGER", HFILL }},
{ &hf_cms_iv,
{ "iv", "cms.iv",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.OCTET_STRING", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "OCTET_STRING", HFILL }},
{ &hf_cms_extendedCertificateInfo,
- { "extendedCertificateInfo", "cms.extendedCertificateInfo",
+ { "extendedCertificateInfo", "cms.extendedCertificateInfo_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.ExtendedCertificateInfo", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_signature,
{ "signature", "cms.signature",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.Signature", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
{ &hf_cms_attributes,
{ "attributes", "cms.attributes",
FT_UINT32, BASE_DEC, NULL, 0,
- "cms.UnauthAttributes", HFILL }},
+ "UnauthAttributes", HFILL }},
{ &hf_cms_SMIMECapabilities_item,
- { "Item", "cms.SMIMECapabilities_item",
+ { "SMIMECapability", "cms.SMIMECapability_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.SMIMECapability", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_capability,
{ "capability", "cms.capability",
FT_OID, BASE_NONE, NULL, 0,
- "cms.T_capability", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_parameters,
- { "parameters", "cms.parameters",
+ { "parameters", "cms.parameters_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.T_parameters", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_recipientKeyId,
- { "recipientKeyId", "cms.recipientKeyId",
+ { "recipientKeyId", "cms.recipientKeyId_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.RecipientKeyIdentifier", HFILL }},
+ "RecipientKeyIdentifier", HFILL }},
{ &hf_cms_subjectAltKeyIdentifier,
{ "subjectAltKeyIdentifier", "cms.subjectAltKeyIdentifier",
- FT_BYTES, BASE_HEX, NULL, 0,
- "cms.SubjectKeyIdentifier", HFILL }},
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "SubjectKeyIdentifier", HFILL }},
{ &hf_cms_rc2WrapParameter,
{ "rc2WrapParameter", "cms.rc2WrapParameter",
FT_INT32, BASE_DEC, NULL, 0,
- "cms.RC2WrapParameter", HFILL }},
+ NULL, HFILL }},
{ &hf_cms_rc2CBCParameter,
- { "rc2CBCParameter", "cms.rc2CBCParameter",
+ { "rc2CBCParameter", "cms.rc2CBCParameter_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_cms_acInfo,
+ { "acInfo", "cms.acInfo_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "AttributeCertificateInfoV1", HFILL }},
+ { &hf_cms_signatureAlgorithm_v1,
+ { "signatureAlgorithm", "cms.signatureAlgorithm_element",
FT_NONE, BASE_NONE, NULL, 0,
- "cms.RC2CBCParameter", HFILL }},
+ "AlgorithmIdentifier", HFILL }},
+ { &hf_cms_signatureValue_v1,
+ { "signature", "cms.signature",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "BIT_STRING", HFILL }},
+ { &hf_cms_version_v1,
+ { "version", "cms.version",
+ FT_INT32, BASE_DEC, VALS(cms_AttCertVersionV1_vals), 0,
+ "AttCertVersionV1", HFILL }},
+ { &hf_cms_subject,
+ { "subject", "cms.subject",
+ FT_UINT32, BASE_DEC, VALS(cms_T_subject_vals), 0,
+ NULL, HFILL }},
+ { &hf_cms_baseCertificateID,
+ { "baseCertificateID", "cms.baseCertificateID_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "IssuerSerial", HFILL }},
+ { &hf_cms_subjectName,
+ { "subjectName", "cms.subjectName",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "GeneralNames", HFILL }},
+ { &hf_cms_issuer_v1,
+ { "issuer", "cms.issuer",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "GeneralNames", HFILL }},
+ { &hf_cms_signature_v1,
+ { "signature", "cms.signature_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ "AlgorithmIdentifier", HFILL }},
+ { &hf_cms_attCertValidityPeriod,
+ { "attCertValidityPeriod", "cms.attCertValidityPeriod_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_cms_attributes_v1,
+ { "attributes", "cms.attributes",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ "SEQUENCE_OF_Attribute", HFILL }},
+ { &hf_cms_attributes_v1_item,
+ { "Attribute", "cms.Attribute_element",
+ FT_NONE, BASE_NONE, NULL, 0,
+ NULL, HFILL }},
+ { &hf_cms_issuerUniqueID,
+ { "issuerUniqueID", "cms.issuerUniqueID",
+ FT_BYTES, BASE_NONE, NULL, 0,
+ "UniqueIdentifier", HFILL }},
+ { &hf_cms_extensions,
+ { "extensions", "cms.extensions",
+ FT_UINT32, BASE_DEC, NULL, 0,
+ NULL, HFILL }},
/*--- End of included file: packet-cms-hfarr.c ---*/
-#line 148 "packet-cms-template.c"
+#line 147 "../../asn1/cms/packet-cms-template.c"
};
/* List of subtrees */
static gint *ett[] = {
/*--- Included file: packet-cms-ettarr.c ---*/
-#line 1 "packet-cms-ettarr.c"
+#line 1 "../../asn1/cms/packet-cms-ettarr.c"
&ett_cms_ContentInfo,
&ett_cms_SignedData,
&ett_cms_DigestAlgorithmIdentifiers,
&ett_cms_RecipientKeyIdentifier,
&ett_cms_KEKRecipientInfo,
&ett_cms_KEKIdentifier,
+ &ett_cms_PasswordRecipientInfo,
+ &ett_cms_OtherRecipientInfo,
&ett_cms_DigestedData,
&ett_cms_EncryptedData,
&ett_cms_AuthenticatedData,
&ett_cms_AuthAttributes,
&ett_cms_UnauthAttributes,
- &ett_cms_CertificateRevocationLists,
+ &ett_cms_RevocationInfoChoices,
+ &ett_cms_RevocationInfoChoice,
+ &ett_cms_OtherRevocationInfoFormat,
&ett_cms_CertificateChoices,
&ett_cms_CertificateSet,
&ett_cms_IssuerAndSerialNumber,
&ett_cms_SMIMECapability,
&ett_cms_SMIMEEncryptionKeyPreference,
&ett_cms_RC2CBCParameters,
+ &ett_cms_AttributeCertificateV1,
+ &ett_cms_AttributeCertificateInfoV1,
+ &ett_cms_T_subject,
+ &ett_cms_SEQUENCE_OF_Attribute,
/*--- End of included file: packet-cms-ettarr.c ---*/
-#line 153 "packet-cms-template.c"
+#line 152 "../../asn1/cms/packet-cms-template.c"
};
/* Register protocol */
proto_register_field_array(proto_cms, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
+ register_ber_syntax_dissector("ContentInfo", proto_cms, dissect_ContentInfo_PDU);
+ register_ber_syntax_dissector("SignedData", proto_cms, dissect_SignedData_PDU);
register_ber_oid_syntax(".p7s", NULL, "ContentInfo");
register_ber_oid_syntax(".p7m", NULL, "ContentInfo");
register_ber_oid_syntax(".p7c", NULL, "ContentInfo");
void proto_reg_handoff_cms(void) {
/*--- Included file: packet-cms-dis-tab.c ---*/
-#line 1 "packet-cms-dis-tab.c"
+#line 1 "../../asn1/cms/packet-cms-dis-tab.c"
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.6", dissect_ContentInfo_PDU, proto_cms, "id-ct-contentInfo");
register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData");
register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData");
register_ber_oid_dissector("1.2.840.113549.3.2", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc2-cbc");
register_ber_oid_dissector("1.2.840.113549.3.4", dissect_RC2CBCParameters_PDU, proto_cms, "id-alg-rc4");
register_ber_oid_dissector("1.2.840.113549.1.9.16.3.7", dissect_RC2WrapParameter_PDU, proto_cms, "id-alg-cmsrc2-wrap");
+ register_ber_oid_dissector("2.16.840.1.113730.3.1.40", dissect_SignedData_PDU, proto_cms, "userSMIMECertificate");
/*--- End of included file: packet-cms-dis-tab.c ---*/
-#line 174 "packet-cms-template.c"
+#line 174 "../../asn1/cms/packet-cms-template.c"
oid_add_from_string("id-data","1.2.840.113549.1.7.1");
oid_add_from_string("id-alg-des-ede3-cbc","1.2.840.113549.3.7");
git.samba.org / metze / wireshark / wip.git / blobdiff