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

Added deltaRevocationList. 

svn path=/trunk/; revision=46438
This commit is contained in:
Stig Bjørlykke 2012-12-07 11:40:29 +00:00
parent 264ac136ef
commit 38aeb0e1e3
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asn1/x509af/x509af.cnf
View File

@ -41,6 +41,7 @@ Certificate B "2.5.4.37" "id-at-cAcertificate"
CertificateList B "2.5.4.38" "id-at-authorityRevocationList"
CertificateList B "2.5.4.39" "id-at-certificateRevocationList"
CertificatePair B "2.5.4.40" "id-at-crossCertificatePair"
CertificateList B "2.5.4.53" "id-at-deltaRevocationList"
AttributeCertificate B "2.5.4.58" "id-at-attributeCertificate"
CertificateList B "2.5.4.59" "id-at-attributeCertificateRevocationList"

6
asn1/x509sat/x509sat.cnf
View File

@ -169,11 +169,11 @@ ProtocolInformation B "2.5.4.48" "id-at-protocolInformation"
NameAndOptionalUID B "2.5.4.50" "id-at-uniqueMember"
DirectoryString B "2.5.4.51" "id-at-houseIdentifier"
ObjectIdentifier B "2.5.4.52" "id-at-supportedAlgorithms"
# 53 "id-at-deltaRevocationList" - what syntax?
# 53 "id-at-deltaRevocationList" - see x509af.cnf
DirectoryString B "2.5.4.54" "id-at-dmdName"
#Clearance B "2.5.4.55" "id-at-clearance"
# 56 "id-at-defaultDirQop" - what syntax?
# 56 "id-at-attributeIntegrityInfo" - what syntax?
ObjectIdentifier B "2.5.4.56" "id-at-defaultDirQop"
# 57 "id-at-attributeIntegrityInfo" - what syntax?
# 58 "id-at-attributeCertificate" - see x509af.cnf
# 59 "id-at-attributeCertificateRevocationLIst" - see x509af.cnf
# 60 "id-at-confKeyInfo" - what syntax?

11
epan/dissectors/packet-x509af.c
View File

@ -212,7 +212,7 @@ dissect_x509af_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_x509af_T_algorithmId(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 70 "../../asn1/x509af/x509af.cnf"
#line 71 "../../asn1/x509af/x509af.cnf"
const char *name;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id);
@ -233,7 +233,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_x509af_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 81 "../../asn1/x509af/x509af.cnf"
#line 82 "../../asn1/x509af/x509af.cnf"
offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree);
@ -324,7 +324,7 @@ static const ber_choice_t SubjectName_choice[] = {
static int
dissect_x509af_SubjectName(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 108 "../../asn1/x509af/x509af.cnf"
#line 109 "../../asn1/x509af/x509af.cnf"
const char* str;
offset = dissect_ber_choice(actx, tree, tvb, offset,
@ -370,7 +370,7 @@ dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_x509af_T_extnId(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 "../../asn1/x509af/x509af.cnf"
#line 88 "../../asn1/x509af/x509af.cnf"
const char *name;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_extension_id, &extension_id);
@ -400,7 +400,7 @@ dissect_x509af_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_x509af_T_extnValue(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 98 "../../asn1/x509af/x509af.cnf"
#line 99 "../../asn1/x509af/x509af.cnf"
gint8 class;
gboolean pc, ind;
gint32 tag;
@ -1308,6 +1308,7 @@ void proto_reg_handoff_x509af(void) {
register_ber_oid_dissector("2.5.4.38", dissect_CertificateList_PDU, proto_x509af, "id-at-authorityRevocationList");
register_ber_oid_dissector("2.5.4.39", dissect_CertificateList_PDU, proto_x509af, "id-at-certificateRevocationList");
register_ber_oid_dissector("2.5.4.40", dissect_CertificatePair_PDU, proto_x509af, "id-at-crossCertificatePair");
register_ber_oid_dissector("2.5.4.53", dissect_CertificateList_PDU, proto_x509af, "id-at-deltaRevocationList");
register_ber_oid_dissector("2.5.4.58", dissect_AttributeCertificate_PDU, proto_x509af, "id-at-attributeCertificate");
register_ber_oid_dissector("2.5.4.59", dissect_CertificateList_PDU, proto_x509af, "id-at-attributeCertificateRevocationList");
register_ber_oid_dissector("1.2.840.10040.4.1", dissect_DSS_Params_PDU, proto_x509af, "id-dsa");

1
epan/dissectors/packet-x509sat.c
View File

@ -2686,6 +2686,7 @@ void proto_reg_handoff_x509sat(void) {
register_ber_oid_dissector("2.5.4.51", dissect_DirectoryString_PDU, proto_x509sat, "id-at-houseIdentifier");
register_ber_oid_dissector("2.5.4.52", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-supportedAlgorithms");
register_ber_oid_dissector("2.5.4.54", dissect_DirectoryString_PDU, proto_x509sat, "id-at-dmdName");
register_ber_oid_dissector("2.5.4.56", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-defaultDirQop");
register_ber_oid_dissector("2.5.4.65", dissect_DirectoryString_PDU, proto_x509sat, "id-at-pseudonym");
register_ber_oid_dissector("2.5.4.66", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsService");
register_ber_oid_dissector("2.5.4.67", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsNetwork");