Merging upstream version 4.4.0.

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

2 files changed, 14 insertions, 13 deletions

diff --git a/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
index 23b8a402..2856cc7b 100644
--- a/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
+++ b/epan/dissectors/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
@@ -32,18 +32,18 @@
 --
 --
 --NOTE: This ASN1 definition have been significantly modified from the original
---version in RFC2459 in order to accomodate the featuresets available
+--version in RFC2459 in order to accommodate the feature sets available
 --in the Wireshark projects asn2wrs compiler.
 --It has also been modified and structures have been commented out that
 --are already implemented in the X509 dissectors.
---Dissectors present already in the X509 dissectors should be implemented in 
+--Dissectors present already in the X509 dissectors should be implemented in
 --the template by hand as stubs that will just call the original
 --dissector functions in X509 in order not to duplicate code.
 --
---Structures and constructs in this definition are uncommented and 
+--Structures and constructs in this definition are uncommented and
 --implemented on-demand when someone needs them.
 --
---If you export new types from this file, make sure to update the 
+--If you export new types from this file, make sure to update the
 --pkix1implicit_exp.cnf file with the proper definitions
 
 
@@ -172,7 +172,7 @@ Dummy ::= NULL
 --        issuerDomainPolicy           CertPolicyId,
 --        subjectDomainPolicy          CertPolicyId }
 --
--- Certificate subject and certificate issuer attributes extensions 
+-- Certificate subject and certificate issuer attributes extensions
 --
 --subjectAltName EXTENSION ::= {
 --        SYNTAX  GeneralNames
@@ -190,7 +190,7 @@ Dummy ::= NULL
 --        ediPartyName                [5] EDIPartyName,
 --        uniformResourceIdentifier   [6] IA5String,
 --        iPAddress                   [7] OCTET STRING,
---        registeredID                [8] OBJECT IDENTIFIER 
+--        registeredID                [8] OBJECT IDENTIFIER
 --}
 
 --OTHER-NAME ::= TYPE-IDENTIFIER
@@ -209,7 +209,7 @@ EDIPartyName ::= SEQUENCE {
 --
 --AttributesSyntax ::= SEQUENCE SIZE (1..MAX) OF Attribute
 --
--- Certification path constraints extensions 
+-- Certification path constraints extensions
 --
 --basicConstraints EXTENSION ::= {
 --        SYNTAX  BasicConstraintsSyntax
@@ -247,7 +247,7 @@ EDIPartyName ::= SEQUENCE {
 --
 --SkipCerts ::= INTEGER (0..MAX)
 --
--- Basic CRL extensions 
+-- Basic CRL extensions
 --
 --cRLNumber EXTENSION ::= {
 --        SYNTAX  CRLNumber
@@ -290,7 +290,7 @@ EDIPartyName ::= SEQUENCE {
 --        SYNTAX  GeneralizedTime
 --        IDENTIFIED BY id-ce-invalidityDate }
 --
--- CRL distribution points and delta-CRL extensions 
+-- CRL distribution points and delta-CRL extensions
 --
 --cRLDistributionPoints EXTENSION ::= {
 --
@@ -338,7 +338,7 @@ EDIPartyName ::= SEQUENCE {
 --
 --BaseCRLNumber ::= CRLNumber
 --
--- Object identifier assignments for ISO certificate extensions 
+-- Object identifier assignments for ISO certificate extensions
 --id-ce   OBJECT IDENTIFIER       ::=     {joint-iso-ccitt(2) ds(5) 29}
 --
 --id-ce-subjectDirectoryAttributes   OBJECT IDENTIFIER ::= {id-ce 9}
diff --git a/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c b/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c
index f6aed246..db4f5000 100644
--- a/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c
+++ b/epan/dissectors/asn1/pkix1implicit/packet-pkix1implicit-template.c
@@ -11,6 +11,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wsutil/array.h>
 
 #include <epan/asn1.h>
 #include "packet-ber.h"
@@ -18,7 +19,7 @@
 #include "packet-pkix1explicit.h"
 #include "packet-x509ce.h"
 
-#define PNAME  "PKIX1Implitit"
+#define PNAME  "PKIX1Implicit"
 #define PSNAME "PKIX1IMPLICIT"
 #define PFNAME "pkix1implicit"
 
@@ -26,7 +27,7 @@ void proto_register_pkix1implicit(void);
 void proto_reg_handoff_pkix1implicit(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_pkix1implicit = -1;
+static int proto_pkix1implicit;
 #include "packet-pkix1implicit-hf.c"
 
 /* Initialize the subtree pointers */
@@ -58,7 +59,7 @@ void proto_register_pkix1implicit(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 #include "packet-pkix1implicit-ettarr.c"
   };