2 files changed, 28 insertions, 28 deletions

diff --git a/src/lib/libcrypto/cms/cms_asn1.c b/src/lib/libcrypto/cms/cms_asn1.c
index d8b55b31a6..ab884dcf6e 100644
--- a/src/lib/libcrypto/cms/cms_asn1.c
+++ b/src/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_asn1.c,v 1.16 2019/08/11 10:24:15 jsing Exp $ */
+/* $OpenBSD: cms_asn1.c,v 1.17 2019/08/11 10:26:04 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -242,7 +242,7 @@ static const ASN1_TEMPLATE CMS_SignerInfo_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_SignerInfo, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -358,7 +358,7 @@ static const ASN1_TEMPLATE CMS_SignedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_SignedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_SET_OF,
@@ -474,7 +474,7 @@ static const ASN1_TEMPLATE CMS_KeyTransRecipientInfo_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_KeyTransRecipientInfo, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -734,7 +734,7 @@ static const ASN1_TEMPLATE CMS_KeyAgreeRecipientInfo_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_KeyAgreeRecipientInfo, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_EXPLICIT,
@@ -816,7 +816,7 @@ static const ASN1_TEMPLATE CMS_KEKRecipientInfo_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_KEKRecipientInfo, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -857,7 +857,7 @@ static const ASN1_TEMPLATE CMS_PasswordRecipientInfo_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_PasswordRecipientInfo, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
@@ -1003,7 +1003,7 @@ static const ASN1_TEMPLATE CMS_EnvelopedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_EnvelopedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
@@ -1051,7 +1051,7 @@ static const ASN1_TEMPLATE CMS_DigestedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_DigestedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -1092,7 +1092,7 @@ static const ASN1_TEMPLATE CMS_EncryptedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_EncryptedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -1126,7 +1126,7 @@ static const ASN1_TEMPLATE CMS_AuthenticatedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_AuthenticatedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL,
@@ -1202,7 +1202,7 @@ static const ASN1_TEMPLATE CMS_CompressedData_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_CompressedData, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
@@ -1453,7 +1453,7 @@ static const ASN1_TEMPLATE CMS_ReceiptsFrom_ch_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_ReceiptsFrom, d.allOrFirstTier),
                 .field_name = "d.allOrFirstTier",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF,
@@ -1514,7 +1514,7 @@ static const ASN1_TEMPLATE CMS_Receipt_seq_tt[] = {
                 .tag = 0,
                 .offset = offsetof(CMS_Receipt, version),
                 .field_name = "version",
-                .item = &INT32_it,
+                .item = &LONG_it,
         },
         {
                 .flags = 0,
diff --git a/src/lib/libcrypto/cms/cms_lcl.h b/src/lib/libcrypto/cms/cms_lcl.h
index b46290af3e..a8ccaf4488 100644
--- a/src/lib/libcrypto/cms/cms_lcl.h
+++ b/src/lib/libcrypto/cms/cms_lcl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_lcl.h,v 1.10 2019/08/11 10:15:30 jsing Exp $ */
+/* $OpenBSD: cms_lcl.h,v 1.11 2019/08/11 10:26:04 jsing Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -108,7 +108,7 @@ struct CMS_ContentInfo_st {
 DECLARE_STACK_OF(CMS_CertificateChoices)
 
 struct CMS_SignedData_st {
-        int32_t version;
+        long version;
         STACK_OF(X509_ALGOR) *digestAlgorithms;
         CMS_EncapsulatedContentInfo *encapContentInfo;
         STACK_OF(CMS_CertificateChoices) *certificates;
@@ -124,7 +124,7 @@ struct CMS_EncapsulatedContentInfo_st {
 };
 
 struct CMS_SignerInfo_st {
-        int32_t version;
+        long version;
         CMS_SignerIdentifier *sid;
         X509_ALGOR *digestAlgorithm;
         STACK_OF(X509_ATTRIBUTE) *signedAttrs;
@@ -148,7 +148,7 @@ struct CMS_SignerIdentifier_st {
 };
 
 struct CMS_EnvelopedData_st {
-        int32_t version;
+        long version;
         CMS_OriginatorInfo *originatorInfo;
         STACK_OF(CMS_RecipientInfo) *recipientInfos;
         CMS_EncryptedContentInfo *encryptedContentInfo;
@@ -186,7 +186,7 @@ struct CMS_RecipientInfo_st {
 typedef CMS_SignerIdentifier CMS_RecipientIdentifier;
 
 struct CMS_KeyTransRecipientInfo_st {
-        int32_t version;
+        long version;
         CMS_RecipientIdentifier *rid;
         X509_ALGOR *keyEncryptionAlgorithm;
         ASN1_OCTET_STRING *encryptedKey;
@@ -198,7 +198,7 @@ struct CMS_KeyTransRecipientInfo_st {
 };
 
 struct CMS_KeyAgreeRecipientInfo_st {
-        int32_t version;
+        long version;
         CMS_OriginatorIdentifierOrKey *originator;
         ASN1_OCTET_STRING *ukm;
         X509_ALGOR *keyEncryptionAlgorithm;
@@ -245,7 +245,7 @@ struct CMS_RecipientKeyIdentifier_st {
 };
 
 struct CMS_KEKRecipientInfo_st {
-        int32_t version;
+        long version;
         CMS_KEKIdentifier *kekid;
         X509_ALGOR *keyEncryptionAlgorithm;
         ASN1_OCTET_STRING *encryptedKey;
@@ -261,7 +261,7 @@ struct CMS_KEKIdentifier_st {
 };
 
 struct CMS_PasswordRecipientInfo_st {
-        int32_t version;
+        long version;
         X509_ALGOR *keyDerivationAlgorithm;
         X509_ALGOR *keyEncryptionAlgorithm;
         ASN1_OCTET_STRING *encryptedKey;
@@ -276,20 +276,20 @@ struct CMS_OtherRecipientInfo_st {
 };
 
 struct CMS_DigestedData_st {
-        int32_t version;
+        long version;
         X509_ALGOR *digestAlgorithm;
         CMS_EncapsulatedContentInfo *encapContentInfo;
         ASN1_OCTET_STRING *digest;
 };
 
 struct CMS_EncryptedData_st {
-        int32_t version;
+        long version;
         CMS_EncryptedContentInfo *encryptedContentInfo;
         STACK_OF(X509_ATTRIBUTE) *unprotectedAttrs;
 };
 
 struct CMS_AuthenticatedData_st {
-        int32_t version;
+        long version;
         CMS_OriginatorInfo *originatorInfo;
         STACK_OF(CMS_RecipientInfo) *recipientInfos;
         X509_ALGOR *macAlgorithm;
@@ -301,7 +301,7 @@ struct CMS_AuthenticatedData_st {
 };
 
 struct CMS_CompressedData_st {
-        int32_t version;
+        long version;
         X509_ALGOR *compressionAlgorithm;
         STACK_OF(CMS_RecipientInfo) *recipientInfos;
         CMS_EncapsulatedContentInfo *encapContentInfo;
@@ -373,14 +373,14 @@ struct CMS_ReceiptRequest_st {
 struct CMS_ReceiptsFrom_st {
         int type;
         union {
-                int32_t allOrFirstTier;
+                long allOrFirstTier;
                 STACK_OF(GENERAL_NAMES) *receiptList;
         } d;
 };
 #endif
 
 struct CMS_Receipt_st {
-        int32_t version;
+        long version;
         ASN1_OBJECT *contentType;
         ASN1_OCTET_STRING *signedContentIdentifier;
         ASN1_OCTET_STRING *originatorSignatureValue;