diff options
Diffstat (limited to 'src/lib/libcrypto/cms/cms_asn1.c')
-rw-r--r-- | src/lib/libcrypto/cms/cms_asn1.c | 28 |
1 files changed, 14 insertions, 14 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 @@ | |||
1 | /* $OpenBSD: cms_asn1.c,v 1.16 2019/08/11 10:24:15 jsing Exp $ */ | 1 | /* $OpenBSD: cms_asn1.c,v 1.17 2019/08/11 10:26:04 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 3 | * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
4 | * project. | 4 | * project. |
@@ -242,7 +242,7 @@ static const ASN1_TEMPLATE CMS_SignerInfo_seq_tt[] = { | |||
242 | .tag = 0, | 242 | .tag = 0, |
243 | .offset = offsetof(CMS_SignerInfo, version), | 243 | .offset = offsetof(CMS_SignerInfo, version), |
244 | .field_name = "version", | 244 | .field_name = "version", |
245 | .item = &INT32_it, | 245 | .item = &LONG_it, |
246 | }, | 246 | }, |
247 | { | 247 | { |
248 | .flags = 0, | 248 | .flags = 0, |
@@ -358,7 +358,7 @@ static const ASN1_TEMPLATE CMS_SignedData_seq_tt[] = { | |||
358 | .tag = 0, | 358 | .tag = 0, |
359 | .offset = offsetof(CMS_SignedData, version), | 359 | .offset = offsetof(CMS_SignedData, version), |
360 | .field_name = "version", | 360 | .field_name = "version", |
361 | .item = &INT32_it, | 361 | .item = &LONG_it, |
362 | }, | 362 | }, |
363 | { | 363 | { |
364 | .flags = ASN1_TFLG_SET_OF, | 364 | .flags = ASN1_TFLG_SET_OF, |
@@ -474,7 +474,7 @@ static const ASN1_TEMPLATE CMS_KeyTransRecipientInfo_seq_tt[] = { | |||
474 | .tag = 0, | 474 | .tag = 0, |
475 | .offset = offsetof(CMS_KeyTransRecipientInfo, version), | 475 | .offset = offsetof(CMS_KeyTransRecipientInfo, version), |
476 | .field_name = "version", | 476 | .field_name = "version", |
477 | .item = &INT32_it, | 477 | .item = &LONG_it, |
478 | }, | 478 | }, |
479 | { | 479 | { |
480 | .flags = 0, | 480 | .flags = 0, |
@@ -734,7 +734,7 @@ static const ASN1_TEMPLATE CMS_KeyAgreeRecipientInfo_seq_tt[] = { | |||
734 | .tag = 0, | 734 | .tag = 0, |
735 | .offset = offsetof(CMS_KeyAgreeRecipientInfo, version), | 735 | .offset = offsetof(CMS_KeyAgreeRecipientInfo, version), |
736 | .field_name = "version", | 736 | .field_name = "version", |
737 | .item = &INT32_it, | 737 | .item = &LONG_it, |
738 | }, | 738 | }, |
739 | { | 739 | { |
740 | .flags = ASN1_TFLG_EXPLICIT, | 740 | .flags = ASN1_TFLG_EXPLICIT, |
@@ -816,7 +816,7 @@ static const ASN1_TEMPLATE CMS_KEKRecipientInfo_seq_tt[] = { | |||
816 | .tag = 0, | 816 | .tag = 0, |
817 | .offset = offsetof(CMS_KEKRecipientInfo, version), | 817 | .offset = offsetof(CMS_KEKRecipientInfo, version), |
818 | .field_name = "version", | 818 | .field_name = "version", |
819 | .item = &INT32_it, | 819 | .item = &LONG_it, |
820 | }, | 820 | }, |
821 | { | 821 | { |
822 | .flags = 0, | 822 | .flags = 0, |
@@ -857,7 +857,7 @@ static const ASN1_TEMPLATE CMS_PasswordRecipientInfo_seq_tt[] = { | |||
857 | .tag = 0, | 857 | .tag = 0, |
858 | .offset = offsetof(CMS_PasswordRecipientInfo, version), | 858 | .offset = offsetof(CMS_PasswordRecipientInfo, version), |
859 | .field_name = "version", | 859 | .field_name = "version", |
860 | .item = &INT32_it, | 860 | .item = &LONG_it, |
861 | }, | 861 | }, |
862 | { | 862 | { |
863 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, | 863 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, |
@@ -1003,7 +1003,7 @@ static const ASN1_TEMPLATE CMS_EnvelopedData_seq_tt[] = { | |||
1003 | .tag = 0, | 1003 | .tag = 0, |
1004 | .offset = offsetof(CMS_EnvelopedData, version), | 1004 | .offset = offsetof(CMS_EnvelopedData, version), |
1005 | .field_name = "version", | 1005 | .field_name = "version", |
1006 | .item = &INT32_it, | 1006 | .item = &LONG_it, |
1007 | }, | 1007 | }, |
1008 | { | 1008 | { |
1009 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, | 1009 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, |
@@ -1051,7 +1051,7 @@ static const ASN1_TEMPLATE CMS_DigestedData_seq_tt[] = { | |||
1051 | .tag = 0, | 1051 | .tag = 0, |
1052 | .offset = offsetof(CMS_DigestedData, version), | 1052 | .offset = offsetof(CMS_DigestedData, version), |
1053 | .field_name = "version", | 1053 | .field_name = "version", |
1054 | .item = &INT32_it, | 1054 | .item = &LONG_it, |
1055 | }, | 1055 | }, |
1056 | { | 1056 | { |
1057 | .flags = 0, | 1057 | .flags = 0, |
@@ -1092,7 +1092,7 @@ static const ASN1_TEMPLATE CMS_EncryptedData_seq_tt[] = { | |||
1092 | .tag = 0, | 1092 | .tag = 0, |
1093 | .offset = offsetof(CMS_EncryptedData, version), | 1093 | .offset = offsetof(CMS_EncryptedData, version), |
1094 | .field_name = "version", | 1094 | .field_name = "version", |
1095 | .item = &INT32_it, | 1095 | .item = &LONG_it, |
1096 | }, | 1096 | }, |
1097 | { | 1097 | { |
1098 | .flags = 0, | 1098 | .flags = 0, |
@@ -1126,7 +1126,7 @@ static const ASN1_TEMPLATE CMS_AuthenticatedData_seq_tt[] = { | |||
1126 | .tag = 0, | 1126 | .tag = 0, |
1127 | .offset = offsetof(CMS_AuthenticatedData, version), | 1127 | .offset = offsetof(CMS_AuthenticatedData, version), |
1128 | .field_name = "version", | 1128 | .field_name = "version", |
1129 | .item = &INT32_it, | 1129 | .item = &LONG_it, |
1130 | }, | 1130 | }, |
1131 | { | 1131 | { |
1132 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, | 1132 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_OPTIONAL, |
@@ -1202,7 +1202,7 @@ static const ASN1_TEMPLATE CMS_CompressedData_seq_tt[] = { | |||
1202 | .tag = 0, | 1202 | .tag = 0, |
1203 | .offset = offsetof(CMS_CompressedData, version), | 1203 | .offset = offsetof(CMS_CompressedData, version), |
1204 | .field_name = "version", | 1204 | .field_name = "version", |
1205 | .item = &INT32_it, | 1205 | .item = &LONG_it, |
1206 | }, | 1206 | }, |
1207 | { | 1207 | { |
1208 | .flags = 0, | 1208 | .flags = 0, |
@@ -1453,7 +1453,7 @@ static const ASN1_TEMPLATE CMS_ReceiptsFrom_ch_tt[] = { | |||
1453 | .tag = 0, | 1453 | .tag = 0, |
1454 | .offset = offsetof(CMS_ReceiptsFrom, d.allOrFirstTier), | 1454 | .offset = offsetof(CMS_ReceiptsFrom, d.allOrFirstTier), |
1455 | .field_name = "d.allOrFirstTier", | 1455 | .field_name = "d.allOrFirstTier", |
1456 | .item = &INT32_it, | 1456 | .item = &LONG_it, |
1457 | }, | 1457 | }, |
1458 | { | 1458 | { |
1459 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF, | 1459 | .flags = ASN1_TFLG_IMPLICIT | ASN1_TFLG_SEQUENCE_OF, |
@@ -1514,7 +1514,7 @@ static const ASN1_TEMPLATE CMS_Receipt_seq_tt[] = { | |||
1514 | .tag = 0, | 1514 | .tag = 0, |
1515 | .offset = offsetof(CMS_Receipt, version), | 1515 | .offset = offsetof(CMS_Receipt, version), |
1516 | .field_name = "version", | 1516 | .field_name = "version", |
1517 | .item = &INT32_it, | 1517 | .item = &LONG_it, |
1518 | }, | 1518 | }, |
1519 | { | 1519 | { |
1520 | .flags = 0, | 1520 | .flags = 0, |