Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 70 insertions, 69 deletions

diff --git a/epan/dissectors/packet-novell_pkis.c b/epan/dissectors/packet-novell_pkis.c
index 7ed2310e..92c193bb 100644
--- a/epan/dissectors/packet-novell_pkis.c
+++ b/epan/dissectors/packet-novell_pkis.c
@@ -1,7 +1,7 @@
 /* Do not modify this file. Changes will be overwritten.                      */
 /* Generated automatically by the ASN.1 to Wireshark dissector compiler       */
 /* packet-novell_pkis.c                                                       */
-/* asn2wrs.py -b -u -L -p novell_pkis -c ./novell_pkis.cnf -s ./packet-novell_pkis-template -D . -O ../.. novell_pkis.asn */
+/* asn2wrs.py -b -u -q -L -p novell_pkis -c ./novell_pkis.cnf -s ./packet-novell_pkis-template -D . -O ../.. novell_pkis.asn */
 
 /* packet-novell_pkis.c
  *
@@ -20,71 +20,72 @@
 #include <epan/oids.h>
 #include <epan/conversation.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-per.h"
 #include "packet-ber.h"
 
-static int hf_novell_pkis_SecurityAttributes_PDU = -1;  /* SecurityAttributes */
-static int hf_novell_pkis_RelianceLimits_PDU = -1;  /* RelianceLimits */
-static int hf_novell_pkis_versionNumber = -1;     /* OCTET_STRING_SIZE_2 */
-static int hf_novell_pkis_nSI = -1;               /* BOOLEAN */
-static int hf_novell_pkis_securityTM = -1;        /* T_securityTM */
-static int hf_novell_pkis_uriReference = -1;      /* IA5String */
-static int hf_novell_pkis_gLBExtensions = -1;     /* GLBExtensions */
-static int hf_novell_pkis_keyQuality = -1;        /* KeyQuality */
-static int hf_novell_pkis_cryptoProcessQuality = -1;  /* CryptoProcessQuality */
-static int hf_novell_pkis_certificateClass = -1;  /* CertificateClass */
-static int hf_novell_pkis_enterpriseId = -1;      /* EnterpriseId */
-static int hf_novell_pkis_enforceQuality = -1;    /* BOOLEAN */
-static int hf_novell_pkis_compusecQuality = -1;   /* CompusecQuality */
-static int hf_novell_pkis_cryptoQuality = -1;     /* CryptoQuality */
-static int hf_novell_pkis_keyStorageQuality = -1;  /* INTEGER_0_255 */
-static int hf_novell_pkis_CompusecQuality_item = -1;  /* CompusecQualityPair */
-static int hf_novell_pkis_compusecCriteria = -1;  /* INTEGER_0_255 */
-static int hf_novell_pkis_compusecRating = -1;    /* INTEGER_0_255 */
-static int hf_novell_pkis_CryptoQuality_item = -1;  /* CryptoQualityPair */
-static int hf_novell_pkis_cryptoModuleCriteria = -1;  /* INTEGER_0_255 */
-static int hf_novell_pkis_cryptoModuleRating = -1;  /* INTEGER_0_255 */
-static int hf_novell_pkis_classValue = -1;        /* INTEGER_0_255 */
-static int hf_novell_pkis_certificateValid = -1;  /* BOOLEAN */
-static int hf_novell_pkis_rootLabel = -1;         /* SecurityLabelType1 */
-static int hf_novell_pkis_registryLabel = -1;     /* SecurityLabelType1 */
-static int hf_novell_pkis_enterpriseLabel = -1;   /* SEQUENCE_SIZE_1_1_OF_SecurityLabelType1 */
-static int hf_novell_pkis_enterpriseLabel_item = -1;  /* SecurityLabelType1 */
-static int hf_novell_pkis_labelType1 = -1;        /* INTEGER_0_255 */
-static int hf_novell_pkis_secrecyLevel1 = -1;     /* INTEGER_0_255 */
-static int hf_novell_pkis_integrityLevel1 = -1;   /* INTEGER_0_255 */
-static int hf_novell_pkis_secrecyCategories1 = -1;  /* BIT_STRING_SIZE_96 */
-static int hf_novell_pkis_integrityCategories1 = -1;  /* BIT_STRING_SIZE_64 */
-static int hf_novell_pkis_secrecySingletons1 = -1;  /* Singletons */
-static int hf_novell_pkis_integritySingletons1 = -1;  /* Singletons */
-static int hf_novell_pkis_Singletons_item = -1;   /* SingletonChoice */
-static int hf_novell_pkis_uniqueSingleton = -1;   /* INTEGER_0_9223372036854775807 */
-static int hf_novell_pkis_singletonRange = -1;    /* SingletonRange */
-static int hf_novell_pkis_singletonLowerBound = -1;  /* INTEGER_0_9223372036854775807 */
-static int hf_novell_pkis_singletonUpperBound = -1;  /* INTEGER_0_9223372036854775807 */
-static int hf_novell_pkis_singletonValue = -1;    /* BOOLEAN */
-static int hf_novell_pkis_perTransactionLimit = -1;  /* MonetaryValue */
-static int hf_novell_pkis_perCertificateLimit = -1;  /* MonetaryValue */
-static int hf_novell_pkis_currency = -1;          /* Currency */
-static int hf_novell_pkis_amount = -1;            /* INTEGER */
-static int hf_novell_pkis_amtExp10 = -1;          /* INTEGER */
-static gint ett_novell_pkis_SecurityAttributes = -1;
-static gint ett_novell_pkis_GLBExtensions = -1;
-static gint ett_novell_pkis_Quality = -1;
-static gint ett_novell_pkis_CompusecQuality = -1;
-static gint ett_novell_pkis_CompusecQualityPair = -1;
-static gint ett_novell_pkis_CryptoQuality = -1;
-static gint ett_novell_pkis_CryptoQualityPair = -1;
-static gint ett_novell_pkis_CertificateClass = -1;
-static gint ett_novell_pkis_EnterpriseId = -1;
-static gint ett_novell_pkis_SEQUENCE_SIZE_1_1_OF_SecurityLabelType1 = -1;
-static gint ett_novell_pkis_SecurityLabelType1 = -1;
-static gint ett_novell_pkis_Singletons = -1;
-static gint ett_novell_pkis_SingletonChoice = -1;
-static gint ett_novell_pkis_SingletonRange = -1;
-static gint ett_novell_pkis_RelianceLimits = -1;
-static gint ett_novell_pkis_MonetaryValue = -1;
+static int hf_novell_pkis_SecurityAttributes_PDU;  /* SecurityAttributes */
+static int hf_novell_pkis_RelianceLimits_PDU;     /* RelianceLimits */
+static int hf_novell_pkis_versionNumber;          /* OCTET_STRING_SIZE_2 */
+static int hf_novell_pkis_nSI;                    /* BOOLEAN */
+static int hf_novell_pkis_securityTM;             /* T_securityTM */
+static int hf_novell_pkis_uriReference;           /* IA5String */
+static int hf_novell_pkis_gLBExtensions;          /* GLBExtensions */
+static int hf_novell_pkis_keyQuality;             /* KeyQuality */
+static int hf_novell_pkis_cryptoProcessQuality;   /* CryptoProcessQuality */
+static int hf_novell_pkis_certificateClass;       /* CertificateClass */
+static int hf_novell_pkis_enterpriseId;           /* EnterpriseId */
+static int hf_novell_pkis_enforceQuality;         /* BOOLEAN */
+static int hf_novell_pkis_compusecQuality;        /* CompusecQuality */
+static int hf_novell_pkis_cryptoQuality;          /* CryptoQuality */
+static int hf_novell_pkis_keyStorageQuality;      /* INTEGER_0_255 */
+static int hf_novell_pkis_CompusecQuality_item;   /* CompusecQualityPair */
+static int hf_novell_pkis_compusecCriteria;       /* INTEGER_0_255 */
+static int hf_novell_pkis_compusecRating;         /* INTEGER_0_255 */
+static int hf_novell_pkis_CryptoQuality_item;     /* CryptoQualityPair */
+static int hf_novell_pkis_cryptoModuleCriteria;   /* INTEGER_0_255 */
+static int hf_novell_pkis_cryptoModuleRating;     /* INTEGER_0_255 */
+static int hf_novell_pkis_classValue;             /* INTEGER_0_255 */
+static int hf_novell_pkis_certificateValid;       /* BOOLEAN */
+static int hf_novell_pkis_rootLabel;              /* SecurityLabelType1 */
+static int hf_novell_pkis_registryLabel;          /* SecurityLabelType1 */
+static int hf_novell_pkis_enterpriseLabel;        /* SEQUENCE_SIZE_1_1_OF_SecurityLabelType1 */
+static int hf_novell_pkis_enterpriseLabel_item;   /* SecurityLabelType1 */
+static int hf_novell_pkis_labelType1;             /* INTEGER_0_255 */
+static int hf_novell_pkis_secrecyLevel1;          /* INTEGER_0_255 */
+static int hf_novell_pkis_integrityLevel1;        /* INTEGER_0_255 */
+static int hf_novell_pkis_secrecyCategories1;     /* BIT_STRING_SIZE_96 */
+static int hf_novell_pkis_integrityCategories1;   /* BIT_STRING_SIZE_64 */
+static int hf_novell_pkis_secrecySingletons1;     /* Singletons */
+static int hf_novell_pkis_integritySingletons1;   /* Singletons */
+static int hf_novell_pkis_Singletons_item;        /* SingletonChoice */
+static int hf_novell_pkis_uniqueSingleton;        /* INTEGER_0_9223372036854775807 */
+static int hf_novell_pkis_singletonRange;         /* SingletonRange */
+static int hf_novell_pkis_singletonLowerBound;    /* INTEGER_0_9223372036854775807 */
+static int hf_novell_pkis_singletonUpperBound;    /* INTEGER_0_9223372036854775807 */
+static int hf_novell_pkis_singletonValue;         /* BOOLEAN */
+static int hf_novell_pkis_perTransactionLimit;    /* MonetaryValue */
+static int hf_novell_pkis_perCertificateLimit;    /* MonetaryValue */
+static int hf_novell_pkis_currency;               /* Currency */
+static int hf_novell_pkis_amount;                 /* INTEGER */
+static int hf_novell_pkis_amtExp10;               /* INTEGER */
+static int ett_novell_pkis_SecurityAttributes;
+static int ett_novell_pkis_GLBExtensions;
+static int ett_novell_pkis_Quality;
+static int ett_novell_pkis_CompusecQuality;
+static int ett_novell_pkis_CompusecQualityPair;
+static int ett_novell_pkis_CryptoQuality;
+static int ett_novell_pkis_CryptoQualityPair;
+static int ett_novell_pkis_CertificateClass;
+static int ett_novell_pkis_EnterpriseId;
+static int ett_novell_pkis_SEQUENCE_SIZE_1_1_OF_SecurityLabelType1;
+static int ett_novell_pkis_SecurityLabelType1;
+static int ett_novell_pkis_Singletons;
+static int ett_novell_pkis_SingletonChoice;
+static int ett_novell_pkis_SingletonRange;
+static int ett_novell_pkis_RelianceLimits;
+static int ett_novell_pkis_MonetaryValue;
 
 
 static int
@@ -465,15 +466,15 @@ dissect_novell_pkis_RelianceLimits(bool implicit_tag _U_, tvbuff_t *tvb _U_, int
 static int dissect_SecurityAttributes_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
-  offset = dissect_novell_pkis_SecurityAttributes(FALSE, tvb, offset, &asn1_ctx, tree, hf_novell_pkis_SecurityAttributes_PDU);
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo);
+  offset = dissect_novell_pkis_SecurityAttributes(false, tvb, offset, &asn1_ctx, tree, hf_novell_pkis_SecurityAttributes_PDU);
   return offset;
 }
 static int dissect_RelianceLimits_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
-  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
-  offset = dissect_novell_pkis_RelianceLimits(FALSE, tvb, offset, &asn1_ctx, tree, hf_novell_pkis_RelianceLimits_PDU);
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo);
+  offset = dissect_novell_pkis_RelianceLimits(false, tvb, offset, &asn1_ctx, tree, hf_novell_pkis_RelianceLimits_PDU);
   return offset;
 }
 
@@ -481,7 +482,7 @@ static int dissect_RelianceLimits_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 void proto_register_novell_pkis (void);
 void proto_reg_handoff_novell_pkis(void);
 
-static int proto_novell_pkis = -1;
+static int proto_novell_pkis;
 
 void proto_reg_handoff_novell_pkis(void)
 {
@@ -674,7 +675,7 @@ void proto_register_novell_pkis (void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
   };
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_novell_pkis_SecurityAttributes,
     &ett_novell_pkis_GLBExtensions,
     &ett_novell_pkis_Quality,
@@ -694,7 +695,7 @@ void proto_register_novell_pkis (void)
   };
 
   /* execute protocol initialization only once */
-  if (proto_novell_pkis != -1) return;
+  if (proto_novell_pkis > 0) return;
 
   proto_novell_pkis = proto_register_protocol("Novell PKIS ASN.1 type", "novell_pkis", "novell_pkis");
   proto_register_field_array (proto_novell_pkis, hf, array_length (hf));