diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:14:03 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2008-04-13 16:14:03 +0000 |
| commit | 9bd868fae7d0182dbc2eff4ca1d3b5296c3bab35 (patch) | |
| tree | 952d81b0e971f3a56343eefb9a6548e41ed63490 /asn1/x509sat | |
| parent | f8b679847ec558a3b54096d18ecaddb8370ffd8d (diff) | |
Support for RFC 4530 - LDAP entryUUID attribute.
svn path=/trunk/; revision=24984
Diffstat (limited to 'asn1/x509sat')
| -rw-r--r-- | asn1/x509sat/SelectedAttributeTypes.asn | 2 | ||||
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 28 |
2 files changed, 28 insertions, 2 deletions
diff --git a/asn1/x509sat/SelectedAttributeTypes.asn b/asn1/x509sat/SelectedAttributeTypes.asn index 5bfd5449cc..140f42beae 100644 --- a/asn1/x509sat/SelectedAttributeTypes.asn +++ b/asn1/x509sat/SelectedAttributeTypes.asn @@ -1481,7 +1481,7 @@ SyntaxGraphicString ::= GraphicString SyntaxISO646String ::= ISO646String SyntaxVisibleString ::= VisibleString SyntaxGeneralString ::= GeneralString - +GUID ::= OCTET STRING END -- SelectedAttributeTypes diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 3bbd5dfab0..526024d595 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -3,6 +3,9 @@ # $Id$ +#.TYPE_ATTR +GUID TYPE = FT_GUID DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 + #.IMPORT ../x509if/x509if-exp.cnf #.EXPORTS @@ -267,7 +270,8 @@ SyntaxIA5String B "0.9.2342.19200300.100.1.25" "dc" # Microsoft-specific # GeneralName other-name -SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" +SyntaxBMPString B "1.3.6.1.4.1.311.20.2" "id-ms-certificate-template-name" +SyntaxUTF8String B "1.3.6.1.4.1.311.20.2.3" "id-ms-user-principal-name" # unknown X.420 PerRecipientExtensionField Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension" @@ -278,6 +282,9 @@ SyntaxIA5String B "1.2.826.0.1004.10.1.1" "nexor-originating-ua" # X.420 Message Store Attributes - see x420.cnf Boolean B "2.6.1.6.3" "id-sat-ipm-auto-discarded" +# RFC 4530 +GUID B "1.3.6.1.1.16.4" "entryUUID" + #.NO_EMIT #.TYPE_RENAME @@ -308,6 +315,25 @@ XDayOf/fifth fifth_dayof #.END +#.FN_BODY GUID + gint8 class; + gboolean pc; + gint32 tag; + guint32 len; + e_guid_t uuid; + + if(!implicit_tag){ + offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); + offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL); + } else { + gint32 remaining=tvb_length_remaining(tvb, offset); + len=remaining>0 ? remaining : 0; + } + + tvb_get_ntohguid (tvb, offset, &uuid); + actx->created_item = proto_tree_add_guid(tree, hf_index, tvb, offset, len, &uuid); +#.END + #.END |