diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-09-17 23:23:40 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-09-17 23:23:40 +0000 |
| commit | be39b96247c0a56e97d01c4de99f85e6ccabbdb1 (patch) | |
| tree | 25f6515799dc30f9204bb658f5d4f812cf8e223f /asn1/pkix1explicit | |
| parent | e319fa0348c7252228c89ab4fcf60d3c036abb9d (diff) | |
| download | wireshark-be39b96247c0a56e97d01c4de99f85e6ccabbdb1.tar.gz | |
get rid of some more compiler warnings
svn path=/trunk/; revision=12034
Diffstat (limited to 'asn1/pkix1explicit')
| -rw-r--r-- | asn1/pkix1explicit/packet-pkix1explicit-template.c | 2 | ||||
| -rw-r--r-- | asn1/pkix1explicit/packet-pkix1explicit-template.h | 2 | ||||
| -rw-r--r-- | asn1/pkix1explicit/pkix1explicit.cnf | 3 | ||||
| -rw-r--r-- | asn1/pkix1explicit/pkix1explicit_exp.cnf | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c index e64e72ab45..64d323a033 100644 --- a/asn1/pkix1explicit/packet-pkix1explicit-template.c +++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c @@ -66,7 +66,7 @@ dissect_pkix1explicit_Name(gboolean implicit_tag, tvbuff_t *tvb, int offset, pac return offset; } -static int +int dissect_pkix1explicit_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index); diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.h b/asn1/pkix1explicit/packet-pkix1explicit-template.h index 975f44343d..0a385168b4 100644 --- a/asn1/pkix1explicit/packet-pkix1explicit-template.h +++ b/asn1/pkix1explicit/packet-pkix1explicit-template.h @@ -31,7 +31,7 @@ int dissect_pkix1explicit_AlgorithmIdentifier(gboolean implicit_tag, tvbuff_t *t int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); -/*#include "packet-pkix1explicit-exp.h"*/ +#include "packet-pkix1explicit-exp.h" #endif /* PACKET_PKIX1EXPLICIT_H */ diff --git a/asn1/pkix1explicit/pkix1explicit.cnf b/asn1/pkix1explicit/pkix1explicit.cnf index 612b8d0947..68222450d3 100644 --- a/asn1/pkix1explicit/pkix1explicit.cnf +++ b/asn1/pkix1explicit/pkix1explicit.cnf @@ -7,6 +7,9 @@ #.EXPORTS
+TeletexDomainDefinedAttribute
+TerminalType
+
#.PDU
#.NO_EMIT
diff --git a/asn1/pkix1explicit/pkix1explicit_exp.cnf b/asn1/pkix1explicit/pkix1explicit_exp.cnf index ec75539dde..32c46a31f6 100644 --- a/asn1/pkix1explicit/pkix1explicit_exp.cnf +++ b/asn1/pkix1explicit/pkix1explicit_exp.cnf @@ -4,12 +4,16 @@ AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
Name BER_CLASS_ANY -1
SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+TeletexDomainDefinedAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
+TerminalType BER_CLASS_UNI BER_UNI_TAG_INTEGER
#.END
#.TYPE_ATTR
CertificateSerialNumber TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
Name TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
SubjectPublicKeyInfo TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+TeletexDomainDefinedAttribute TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0
+TerminalType TYPE = FT_INT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0
#.END
|