diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-04-18 21:27:30 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-18 21:42:51 +0000 |
| commit | 1fb902f2175cbfb3a54f8497460a71bd6f7f339e (patch) | |
| tree | 9d5542b3848bf0197d85af0af250854e718fe4cd /asn1 | |
| parent | d35f09761e5db8688e9af5af7aeb4a1f54f982f5 (diff) | |
Use new BER functions in kpasswd.
Added RFC 3244 ChangePasswdData to the kerberos dissector.
This is the last dissector using the "old BER" functions.
Change-Id: I1d79047103c07c268d08e652745391f1ac37c82c
Reviewed-on: https://code.wireshark.org/review/1198
Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/kerberos/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | asn1/kerberos/Makefile.common | 5 | ||||
| -rw-r--r-- | asn1/kerberos/RFC3244.asn | 12 | ||||
| -rw-r--r-- | asn1/kerberos/kerberos.cnf | 3 |
4 files changed, 18 insertions, 3 deletions
diff --git a/asn1/kerberos/CMakeLists.txt b/asn1/kerberos/CMakeLists.txt index 010d8f90f7..0de5b69e0e 100644 --- a/asn1/kerberos/CMakeLists.txt +++ b/asn1/kerberos/CMakeLists.txt @@ -33,6 +33,7 @@ set( EXT_ASN_FILE_LIST set( ASN_FILE_LIST KerberosV5Spec2.asn k5.asn + RFC3244.asn ) set( EXTRA_DIST diff --git a/asn1/kerberos/Makefile.common b/asn1/kerberos/Makefile.common index 8607abbcf2..84fe6032c7 100644 --- a/asn1/kerberos/Makefile.common +++ b/asn1/kerberos/Makefile.common @@ -26,10 +26,9 @@ EXT_ASN_FILE_LIST = ASN_FILE_LIST = \ KerberosV5Spec2.asn \ - k5.asn + k5.asn \ + RFC3244.asn -# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn -# files do not exist # for all protocols: Please add/remove as required. EXTRA_DIST = \ $(ASN_FILE_LIST) \ packet-$(PROTOCOL_NAME)-template.c \ diff --git a/asn1/kerberos/RFC3244.asn b/asn1/kerberos/RFC3244.asn new file mode 100644 index 0000000000..4dcd06e1ec --- /dev/null +++ b/asn1/kerberos/RFC3244.asn @@ -0,0 +1,12 @@ +-- Extracted from RFC 3244 + +RFC3244 DEFINITIONS ::= +BEGIN + +ChangePasswdData ::= SEQUENCE { + newpasswd[0] OCTET STRING, + targname[1] PrincipalName OPTIONAL, + targrealm[2] Realm OPTIONAL +} + +END diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index 8588e6d974..4b1a97fcb0 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -2,6 +2,9 @@ # kerberos conformation file # Copyright 2008 Anders Broman +#.EXPORTS +ChangePasswdData + #.FIELD_RENAME #EncryptedData/etype encryptedData_etype KDC-REQ-BODY/etype kDC-REQ-BODY_etype |