aboutsummaryrefslogtreecommitdiffstats
path: root/asn1.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-12-24 09:10:12 +0000
committerGuy Harris <guy@alum.mit.edu>2000-12-24 09:10:12 +0000
commit60f9476740b196b029d68e2c05f86622610a8334 (patch)
tree46694794d0a173b5ee48a0763ed49f62aa28ef34 /asn1.h
parent57e4216961a5d0bd4f73250e2f4171a25aa176e2 (diff)
Rename "asn1_octet_string_value_decode()" to
"asn1_string_value_decode()", as it can be used for various character string types as well. Turn "asn1_octet_string_decode()" into "asn1_string_decode()", which takes an additional argument giving the tag expected for the string in question, and make "asn1_octet_string_decode()" a wrapper around it. Clean up the ASN.1 dissection in the Kerberos dissector, making more use of the code in "asn1.c", wrapping more operations up in macros, and doing some more type checking. Use "REP" rather than "RESP" in names and strings; "REP" is what the Kerberos spec uses. Make the routines in the Kerberos dissector not used outside that dissector static. Fix some problems with the dissection of strings in the Kerberos dissector (it was extracting the data from the wrong place in the packet). In Kerberos V5, the "kvno" item in the EncryptedData type is optional; treat it as such. Treat integers as unsigned in the Kerberos dissector. svn path=/trunk/; revision=2777
Diffstat (limited to 'asn1.h')
-rw-r--r--asn1.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/asn1.h b/asn1.h
index c497e6572e..d108187110 100644
--- a/asn1.h
+++ b/asn1.h
@@ -1,7 +1,7 @@
/* asn1.h
* Definitions for ASN.1 BER dissection
*
- * $Id: asn1.h,v 1.3 2000/03/27 08:51:05 guy Exp $
+ * $Id: asn1.h,v 1.4 2000/12/24 09:10:11 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -131,8 +131,10 @@ int asn1_uint32_value_decode (ASN1_SCK *asn1, int enc_len, guint *integer);
int asn1_uint32_decode (ASN1_SCK *asn1, guint32 *integer, guint *nbytes);
int asn1_bits_decode (ASN1_SCK *asn1, const guchar *eoc, guchar **bits,
guint *len, guchar *unused);
-int asn1_octet_string_value_decode (ASN1_SCK *asn1, int enc_len,
+int asn1_string_value_decode (ASN1_SCK *asn1, int enc_len,
guchar **octets);
+int asn1_string_decode (ASN1_SCK *asn1, guchar **octets, guint *str_len,
+ guint *nbytes, guint expected_tag);
int asn1_octet_string_decode (ASN1_SCK *asn1, guchar **octets, guint *str_len,
guint *nbytes);
int asn1_subid_decode (ASN1_SCK *asn1, subid_t *subid);