diff options
| author | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-27 08:19:55 +0000 |
|---|---|---|
| committer | gal <gal@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-08-27 08:19:55 +0000 |
| commit | 16d1b20c28be1bb0360e11b1aa5d92e52d58753c (patch) | |
| tree | db590241fbaac3f0aa9904b0e115d79a85064f33 /asn1 | |
| parent | 2d9f238aced57c793e5735735c769eca3b22b82e (diff) | |
Support for X.500 strong authentication - used by DAP, DISP, DSP and DOP.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19048 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/dap/dap-exp.cnf | 2 | ||||
| -rw-r--r-- | asn1/dap/dap.asn | 42 | ||||
| -rw-r--r-- | asn1/dap/dap.cnf | 7 |
3 files changed, 30 insertions, 21 deletions
diff --git a/asn1/dap/dap-exp.cnf b/asn1/dap/dap-exp.cnf index f767e3351a..98539a3205 100644 --- a/asn1/dap/dap-exp.cnf +++ b/asn1/dap/dap-exp.cnf @@ -1,6 +1,6 @@ # Do not modify this file. # It is created automatically by the ASN.1 to Wireshark dissector compiler -# .\dap-exp.cnf +# ./dap-exp.cnf # ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn #.MODULE diff --git a/asn1/dap/dap.asn b/asn1/dap/dap.asn index 9edcea388a..de2dcd2c3b 100644 --- a/asn1/dap/dap.asn +++ b/asn1/dap/dap.asn @@ -325,7 +325,7 @@ SimpleCredentials ::= SEQUENCE { StrongCredentials ::= SET { certification-path [0] CertificationPath OPTIONAL, - bind-token [1] --Token-- ANY, + bind-token [1] Token, name [2] DistinguishedName OPTIONAL, attributeCertificationPath [3] AttributeCertificationPath OPTIONAL } @@ -334,22 +334,30 @@ SpkmCredentials ::= CHOICE {req [0] -- SPKM-REQ -- ANY, rep [1] -- SPKM-REP-TI-- ANY } ---Token ::= +TokenData ::= -- SIGNED --- {SEQUENCE {algorithm [0] AlgorithmIdentifier, --- name [1] DistinguishedName, --- time [2] UTCTime, --- random [3] BIT STRING, --- response [4] BIT STRING OPTIONAL, --- bindIntAlgorithm --- [5] SEQUENCE SIZE (1..MAX) OF AlgorithmIdentifier OPTIONAL, --- bindIntKeyInfo [6] BindKeyInfo OPTIONAL, --- bindConfAlgorithm --- [7] SEQUENCE SIZE (1..MAX) OF AlgorithmIdentifier OPTIONAL, --- bindConfKeyInfo --- [8] BindKeyInfo- -,- - --- OPTIONAL - - dirqop [9] OBJECT IDENTIFIER OPTIONAL- - --- }} +-- { --SEQUENCE {algorithm [0] AlgorithmIdentifier, + name [1] DistinguishedName, + time [2] UTCTime, + random [3] BIT STRING, + response [4] BIT STRING OPTIONAL, + bindIntAlgorithm + [5] SEQUENCE SIZE (1..MAX) OF AlgorithmIdentifier OPTIONAL, + bindIntKeyInfo [6] BindKeyInfo OPTIONAL, + bindConfAlgorithm + [7] SEQUENCE SIZE (1..MAX) OF AlgorithmIdentifier OPTIONAL, + bindConfKeyInfo + [8] BindKeyInfo--,-- + OPTIONAL -- dirqop [9] OBJECT IDENTIFIER OPTIONAL-- + } --} + +-- expand SIGNED macro + +Token ::= SEQUENCE { + token-data TokenData, + algorithm-identifier AlgorithmIdentifier, + encrypted BIT STRING +} Versions ::= BIT STRING {v1(0), v2(1)} @@ -374,7 +382,7 @@ DirectoryBindError ::= CHOICE { } ---BindKeyInfo ::= ENCRYPTED{- - BIT STRING - - +BindKeyInfo ::= -- ENCRYPTED{-- BIT STRING -- --directoryUnbind OPERATION ::= emptyUnbind diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf index 5e5338433e..fcfa9523aa 100644 --- a/asn1/dap/dap.cnf +++ b/asn1/dap/dap.cnf @@ -106,6 +106,10 @@ FilterItem/substrings/type sunstringType ModifyRights/_item/item/value value-assertion +TokenData/name distinguished-name + +TokenData/time utctime + #.FN_BODY T_initial proto_item *it; it = proto_tree_add_item(tree, hf_index, tvb, offset, -1, FALSE); @@ -120,9 +124,6 @@ ModifyRights/_item/item/value value-assertion #.FN_BODY T_matchValue /* XXX: not yet implemented */ -#.FN_BODY T_bind_token - /* XXX: not yet implemented */ - #.FN_BODY T_req /* XXX: not yet implemented */ |