osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

RCS 3280, which obsoletes RFC 2459, allows an IA5String CHOICE in the DisplayText of a UserNotice. 

svn path=/trunk/; revision=33083
This commit is contained in:
Graeme Lunt 2010-06-04 14:36:53 +00:00
parent 946f225f9c
commit d6bd39b51f
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asn1/pkix1implicit/PKIX1IMPLICIT93.asn
View File

@ -405,6 +405,7 @@ NoticeReference ::= SEQUENCE {
noticeNumbers SEQUENCE OF INTEGER }
DisplayText ::= CHOICE {
ia5String IA5String,
visibleString VisibleString,
bmpString BMPString,
utf8String UTF8String }

30
epan/dissectors/packet-pkix1implicit.c
View File

@ -63,6 +63,7 @@ static int hf_pkix1implicit_explicitText = -1; /* DisplayText */
static int hf_pkix1implicit_organization = -1; /* DisplayText */
static int hf_pkix1implicit_noticeNumbers = -1; /* T_noticeNumbers */
static int hf_pkix1implicit_noticeNumbers_item = -1; /* INTEGER */
static int hf_pkix1implicit_ia5String = -1; /* IA5String */
static int hf_pkix1implicit_visibleString = -1; /* VisibleString */
static int hf_pkix1implicit_bmpString = -1; /* BMPString */
static int hf_pkix1implicit_utf8String = -1; /* UTF8String */
@ -159,6 +160,17 @@ dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuf
static int
dissect_pkix1implicit_IA5String(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_IA5String,
actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_pkix1implicit_VisibleString(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_VisibleString,
@ -192,16 +204,18 @@ dissect_pkix1implicit_UTF8String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
static const value_string pkix1implicit_DisplayText_vals[] = {
{ 0, "visibleString" },
{ 1, "bmpString" },
{ 2, "utf8String" },
{ 0, "ia5String" },
{ 1, "visibleString" },
{ 2, "bmpString" },
{ 3, "utf8String" },
{ 0, NULL }
};
static const ber_choice_t DisplayText_choice[] = {
{ 0, &hf_pkix1implicit_visibleString, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_VisibleString },
{ 1, &hf_pkix1implicit_bmpString, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_BMPString },
{ 2, &hf_pkix1implicit_utf8String, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_UTF8String },
{ 0, &hf_pkix1implicit_ia5String, BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_IA5String },
{ 1, &hf_pkix1implicit_visibleString, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_VisibleString },
{ 2, &hf_pkix1implicit_bmpString, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_BMPString },
{ 3, &hf_pkix1implicit_utf8String, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_pkix1implicit_UTF8String },
{ 0, NULL, 0, 0, 0, NULL }
};
@ -342,6 +356,10 @@ void proto_register_pkix1implicit(void) {
{ "noticeNumbers item", "pkix1implicit.noticeNumbers_item",
FT_INT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_pkix1implicit_ia5String,
{ "ia5String", "pkix1implicit.ia5String",
FT_STRING, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_pkix1implicit_visibleString,
{ "visibleString", "pkix1implicit.visibleString",
FT_STRING, BASE_NONE, NULL, 0,