diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-11-16 07:13:12 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-11-16 07:13:12 +0000 |
| commit | c33182b8982742ece2bbfa298977a5aa09f48377 (patch) | |
| tree | 0c7664cef1a075c4ecb3ad5ddc8d364055957829 /asn1/ess | |
| parent | 893ad69c74f54fc9bb7ac7b7ffc3c0e28bd4d418 (diff) | |
From Graeme Lunt:
Here are a number of small patches for asn1 based dissectors:
acse:
release request/response column information (many X.400/X.500 unbinds are
empty)
"standardised" PNAME to "ISO 8650-1 OSI Association Control Service"
fix for crash when using EXTERNAL dissector
rtse:
column information when attempting a resume
x509if:
generation of LDAP-style DNs from RDNSequences
new function x509if_get_last_dn() to get the last DN generated.
x509af:
DSS parameters
certificate extension naming
subject naming of certificate
x509sat:
Guide syntax (as SET now supported)
PDU exports.
cms:
verification of message digest attribute (SHA-1 and MD5)
ess:
enumerated/restrictive/permissive/informative security categories
x411:
generation of string encoding of X.400 addresses, trace information and message identifiers.
s4406:
separate types for primary and copy precedence to allow better filtering (e.g. primary precedence = flash)
priority-level-qualifier
svn path=/trunk/; revision=16508
Diffstat (limited to 'asn1/ess')
| -rw-r--r-- | asn1/ess/ExtendedSecurityServices.asn | 29 | ||||
| -rw-r--r-- | asn1/ess/Makefile.nmake | 4 | ||||
| -rw-r--r-- | asn1/ess/ess.cnf | 5 |
3 files changed, 36 insertions, 2 deletions
diff --git a/asn1/ess/ExtendedSecurityServices.asn b/asn1/ess/ExtendedSecurityServices.asn index 69b2979c6d..06a0eeb192 100644 --- a/asn1/ess/ExtendedSecurityServices.asn +++ b/asn1/ess/ExtendedSecurityServices.asn @@ -191,6 +191,35 @@ SecurityCategory ::= SEQUENCE { --VALUE NOTATION ::= value (VALUE OBJECT IDENTIFIER) --END +-- this is a commonly used definition of security categories + +RestrictiveTag ::= SEQUENCE { + tagName OBJECT IDENTIFIER, + attributeFlags BIT STRING +} + +EnumeratedTag ::= SEQUENCE { + tagName OBJECT IDENTIFIER, + attributeList SET OF SecurityAttribute +} + +PermissiveTag ::= SEQUENCE { + tagName OBJECT IDENTIFIER, + attributeFlags BIT STRING +} + +SecurityAttribute ::= INTEGER + +InformativeTag ::= SEQUENCE { + tagName OBJECT IDENTIFIER, + attributes FreeFormField +} + +FreeFormField ::= CHOICE { + bitSetAttributes BIT STRING, + securityAttributes SET OF SecurityAttribute +} + -- Section 3.4 diff --git a/asn1/ess/Makefile.nmake b/asn1/ess/Makefile.nmake index 3fd2af8b37..acc6e626bf 100644 --- a/asn1/ess/Makefile.nmake +++ b/asn1/ess/Makefile.nmake @@ -43,6 +43,6 @@ fix_eol: generate_dissector del /f packet-$(PROTOCOL_NAME).c.tmp packet-$(PROTOCOL_NAME).h.tmp copy_files: generate_dissector fix_eol - xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d - xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d + xcopy packet-$(PROTOCOL_NAME).c ..\..\epan\dissectors /d /y + xcopy packet-$(PROTOCOL_NAME).h ..\..\epan\dissectors /d /y diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index 10c2caa3ae..e788eced90 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -28,6 +28,11 @@ EquivalentLabels B "1.2.840.113549.1.9.16.2.9" "id-aa-equivalentLabels" MLExpansionHistory B "1.2.840.113549.1.9.16.2.3" "id-aa-mlExpandHistory" SigningCertificate B "1.2.840.113549.1.9.16.2.12" "id-aa-signingCertificate" +RestrictiveTag B "2.16.840.1.101.2.1.8.3.0" "id-restrictiveAttributes" +EnumeratedTag B "2.16.840.1.101.2.1.8.3.1" "id-enumeratedPermissiveAttributes" +PermissiveTag B "2.16.840.1.101.2.1.8.3.2" "id-restrictiveAttributes" +InformativeTag B "2.16.840.1.101.2.1.8.3.3" "id-informativeAttributes" +EnumeratedTag B "2.16.840.1.101.2.1.8.3.4" "id-enumeratedRestrictiveAttributes" #.NO_EMIT |