aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--asn1/x509af/x509af.cnf1
-rw-r--r--asn1/x509if/x509if_exp.cnf1
-rw-r--r--asn1/x509sat/x509sat_exp.cnf4
-rw-r--r--epan/dissectors/packet-x509af.c1
4 files changed, 6 insertions, 1 deletions
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 339719ba92..7fdbd3a7ce 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -9,6 +9,7 @@ CertificateExtensions x509ce
SelectedAttributeTypes x509sat
#.INCLUDE ../x509if/x509if_exp.cnf
+#.INCLUDE ../x509sat/x509sat_exp.cnf
#.EXPORTS
diff --git a/asn1/x509if/x509if_exp.cnf b/asn1/x509if/x509if_exp.cnf
index 48e3a81777..1f8525c89d 100644
--- a/asn1/x509if/x509if_exp.cnf
+++ b/asn1/x509if/x509if_exp.cnf
@@ -2,6 +2,5 @@
#.IMPORT_TAG
GeneralNames BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Name BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING
Attribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509sat/x509sat_exp.cnf b/asn1/x509sat/x509sat_exp.cnf
new file mode 100644
index 0000000000..ed8c43f443
--- /dev/null
+++ b/asn1/x509sat/x509sat_exp.cnf
@@ -0,0 +1,4 @@
+
+#.IMPORT_TAG
+UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING
+
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 368d3789a2..242a7004d0 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -45,6 +45,7 @@
#include "packet-x509af.h"
#include "packet-x509ce.h"
#include "packet-x509if.h"
+#include "packet-x509sat.h"
#define PNAME "X.509 Authentication Framework"
#define PSNAME "X509AF"