diff options
Diffstat (limited to 'asn1/x509if/x509if.cnf')
| -rw-r--r-- | asn1/x509if/x509if.cnf | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index cc770518b1..ab4b47a147 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -11,7 +11,7 @@ ObjectClassKind #.END #.CLASS ATTRIBUTE &derivation ClassReference ATTRIBUTE -&Type +&Type &equality-match ClassReference MATCHING-RULE &ordering-match ClassReference MATCHING-RULE &substrings-match ClassReference MATCHING-RULE @@ -22,8 +22,8 @@ ObjectClassKind &id ObjectIdentifierType #.END #.CLASS CONTEXT -&Type -&Assertion +&Type +&Assertion &id ObjectIdentifierType #.END #.CLASS OBJECT-CLASS @@ -35,14 +35,14 @@ ObjectClassKind #.END #.CLASS MATCHING-RESTRICTION -&Restriction +&Restriction &Rules _FixedTypeValueSetFieldSpec &id ObjectIdentifierType #.END #.CLASS MATCHING-RULE &ParentMatchingRules ClassReference MATCHING-RULE -&AssertionType +&AssertionType &uniqueMatchIndicator ClassReference ATTRIBUTE &id ObjectIdentifierType #.END @@ -187,7 +187,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &actx->external.direct_reference #.FN_BODY AttributeTypeAndDistinguishedValue/type - const char *fmt; + const char *fmt; const char *name; %(DEFAULT_BODY)s @@ -195,7 +195,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(actx->external.direct_reference) { /* see if we can find a nice name */ name = oid_resolved_from_string(actx->external.direct_reference); - if(!name) name = actx->external.direct_reference; + if(!name) name = actx->external.direct_reference; if(last_rdn) { /* append it to the RDN */ g_strlcat(last_rdn, name, MAX_RDN_STR_LEN); @@ -224,7 +224,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; - const char *fmt; + const char *fmt; const char *name = NULL; const char *orig_oid = actx->external.direct_reference; @@ -236,7 +236,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" /* try and dissect as a string */ dissect_ber_octet_string(FALSE, actx, NULL, tvb, old_offset, hf_x509if_any_string, &out_tvb); - + /* should also try and dissect as an OID and integer */ /* of course, if I can look up the syntax .... */ @@ -360,7 +360,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" top_of_rdn = tree; } else { - if(last_rdn) + if(last_rdn) /* this is an additional value - delimit */ g_strlcat(last_rdn, "+", MAX_RDN_STR_LEN); } @@ -370,7 +370,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" rdn_one_value = TRUE; #.FN_BODY RDNSequence - const char *fmt; + const char *fmt; dn_one_rdn = FALSE; /* reset */ last_dn = (char *)wmem_alloc(wmem_packet_scope(), MAX_DN_STR_LEN); *last_dn = '\0'; @@ -395,7 +395,7 @@ DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" if(!dn_one_rdn) { /* this is the first element - record the top */ top_of_dn = tree; - } + } %(DEFAULT_BODY)s |