aboutsummaryrefslogtreecommitdiffstats
path: root/asn1/pkcs12
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2007-05-06 22:34:05 +0000
committerAnders Broman <anders.broman@ericsson.com>2007-05-06 22:34:05 +0000
commit4c692a62b6a0851f8c96dbb3abe73a5e019f7b3e (patch)
treefb70b87f27909b5615ccfb0512abc1ff67a04148 /asn1/pkcs12
parent1103a38976ef39ce9461867c65cc998eb36423fa (diff)
Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
Diffstat (limited to 'asn1/pkcs12')
-rw-r--r--asn1/pkcs12/Makefile.nmake2
-rw-r--r--asn1/pkcs12/packet-pkcs12-template.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/asn1/pkcs12/Makefile.nmake b/asn1/pkcs12/Makefile.nmake
index 8669262858..faad458bf0 100644
--- a/asn1/pkcs12/Makefile.nmake
+++ b/asn1/pkcs12/Makefile.nmake
@@ -15,7 +15,7 @@ generate_dissector: $(DISSECTOR_FILES)
$(DISSECTOR_FILES): ../../tools/asn2wrs.py pkcs12.asn packet-pkcs12-template.c packet-pkcs12-template.h pkcs12.cnf ../cms/cms-exp.cnf ../x509af/x509af-exp.cnf ../x509if/x509if-exp.cnf
!IFDEF PYTHON
- $(PYTHON) ../../tools/asn2wrs.py -b -e -p $(PROTOCOL_NAME) -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn
+ $(PYTHON) "../../tools/asn2wrs.py" -b -e -p $(PROTOCOL_NAME) -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn
!ELSE
@echo Error: You need Python to use asn2wrs.py
@exit 1
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index 581d12bfb7..7b4ac014b0 100644
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -31,6 +31,7 @@
#include <epan/packet.h>
#include <epan/conversation.h>
#include <epan/oid_resolv.h>
+#include <epan/asn1.h>
#include <stdio.h>
#include <string.h>