From: Richard Levitte <levitte@openssl.org>
Date: Wed, 5 Apr 2017 11:37:37 +0000 (+0200)
Subject: Fix test/asn1_encode_test.c, ASN1_LONG_DATA used inappropriately
X-Git-Tag: OpenSSL_1_1_1-pre1~1854
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5748e4dc3ab1cdde43ae6feecb106e3a41adcdf4;p=openssl

Fix test/asn1_encode_test.c, ASN1_LONG_DATA used inappropriately

It's sheer luck that this was used for the first field only which also
has the same type in all data structures, so the offsets were never wrong

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3127)
---

diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index dabb82c89d..02455fcba3 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -265,7 +265,7 @@ typedef struct {
 } ASN1_INT32_DATA;
 
 ASN1_SEQUENCE(ASN1_INT32_DATA) = {
-    ASN1_SIMPLE(ASN1_LONG_DATA, success, ASN1_FBOOLEAN),
+    ASN1_SIMPLE(ASN1_INT32_DATA, success, ASN1_FBOOLEAN),
     ASN1_SIMPLE(ASN1_INT32_DATA, test_int32, INT32),
     ASN1_EXP_OPT(ASN1_INT32_DATA, test_zint32, ZINT32, 0)
 } static_ASN1_SEQUENCE_END(ASN1_INT32_DATA)
@@ -311,7 +311,7 @@ typedef struct {
 } ASN1_UINT32_DATA;
 
 ASN1_SEQUENCE(ASN1_UINT32_DATA) = {
-    ASN1_SIMPLE(ASN1_LONG_DATA, success, ASN1_FBOOLEAN),
+    ASN1_SIMPLE(ASN1_UINT32_DATA, success, ASN1_FBOOLEAN),
     ASN1_SIMPLE(ASN1_UINT32_DATA, test_uint32, UINT32),
     ASN1_EXP_OPT(ASN1_UINT32_DATA, test_zuint32, ZUINT32, 0)
 } static_ASN1_SEQUENCE_END(ASN1_UINT32_DATA)
@@ -357,7 +357,7 @@ typedef struct {
 } ASN1_INT64_DATA;
 
 ASN1_SEQUENCE(ASN1_INT64_DATA) = {
-    ASN1_SIMPLE(ASN1_LONG_DATA, success, ASN1_FBOOLEAN),
+    ASN1_SIMPLE(ASN1_INT64_DATA, success, ASN1_FBOOLEAN),
     ASN1_SIMPLE(ASN1_INT64_DATA, test_int64, INT64),
     ASN1_EXP_OPT(ASN1_INT64_DATA, test_zint64, ZINT64, 0)
 } static_ASN1_SEQUENCE_END(ASN1_INT64_DATA)
@@ -404,7 +404,7 @@ typedef struct {
 } ASN1_UINT64_DATA;
 
 ASN1_SEQUENCE(ASN1_UINT64_DATA) = {
-    ASN1_SIMPLE(ASN1_LONG_DATA, success, ASN1_FBOOLEAN),
+    ASN1_SIMPLE(ASN1_UINT64_DATA, success, ASN1_FBOOLEAN),
     ASN1_SIMPLE(ASN1_UINT64_DATA, test_uint64, UINT64),
     ASN1_EXP_OPT(ASN1_UINT64_DATA, test_zuint64, ZUINT64, 0)
 } static_ASN1_SEQUENCE_END(ASN1_UINT64_DATA)