diff options
| author | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-06-28 14:19:08 +0000 |
|---|---|---|
| committer | kukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-06-28 14:19:08 +0000 |
| commit | cefda4dc7b2ec4b955b7d5b6ddc2f913e684695c (patch) | |
| tree | 8630f1f8a3129f886a07f432a88db41cad2af16d /epan/dissectors/packet-cms.c | |
| parent | 82a38a000b19ea5b4dcf4cb2c366c2b251cb38a2 (diff) | |
remove functions register_ber_oid_name() and get_ber_oid_name() from packet-ber.c, they were only OID but not BER related
use add_oid_str_name() and get_oid_str_name() instead of them
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18595 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-cms.c')
| -rw-r--r-- | epan/dissectors/packet-cms.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index e3879c8e0d..98093da61e 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -492,7 +492,7 @@ dissect_cms_T_attrType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac if(object_identifier_id) { - name = get_ber_oid_name(object_identifier_id); + name = get_oid_str_name(object_identifier_id); proto_item_append_text(tree, " (%s)", name ? name : object_identifier_id); } @@ -754,7 +754,7 @@ const value_string cms_SignerIdentifier_vals[] = { static const ber_choice_t SignerIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } }; @@ -900,7 +900,7 @@ static const value_string cms_RecipientIdentifier_vals[] = { static const ber_choice_t RecipientIdentifier_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, { 0, 0, 0, 0, NULL } }; @@ -1003,8 +1003,8 @@ static const value_string cms_OriginatorIdentifierOrKey_vals[] = { static const ber_choice_t OriginatorIdentifierOrKey_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerAndSerialNumber }, - { 1, BER_CLASS_CON, 0, 0, dissect_subjectKeyIdentifier_impl }, - { 2, BER_CLASS_CON, 1, 0, dissect_originatorKey_impl }, + { 1, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_subjectKeyIdentifier_impl }, + { 2, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_originatorKey_impl }, { 0, 0, 0, 0, NULL } }; @@ -1255,8 +1255,8 @@ static const value_string cms_RecipientInfo_vals[] = { static const ber_choice_t RecipientInfo_choice[] = { { 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ktri }, - { 1, BER_CLASS_CON, 1, 0, dissect_kari_impl }, - { 2, BER_CLASS_CON, 2, 0, dissect_kekri_impl }, + { 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_kari_impl }, + { 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_kekri_impl }, { 0, 0, 0, 0, NULL } }; |