From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 13 Aug 2021 11:01:34 +0000 (+0200)
Subject: Revert "Fix test/asn1_encode_test.c to handle encoding/decoding failure"
X-Git-Tag: OpenSSL_1_1_1l~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eacd2fefa0f9fa0be98cb19a920e01a6ae439022;p=thirdparty%2Fopenssl.git

Revert "Fix test/asn1_encode_test.c to handle encoding/decoding failure"

This reverts commit f1d97905bbd8679b7647c992b97f526791069040.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16308)
---

diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c
index dc0dfaf7b5b..84323387232 100644
--- a/test/asn1_encode_test.c
+++ b/test/asn1_encode_test.c
@@ -742,17 +742,14 @@ static int test_intern(const TEST_PACKAGE *package)
                    sizeof(test_custom_data) / sizeof(test_custom_data[0]));
     for (i = 0; i < nelems; i++) {
         size_t pos = i * package->encode_expectations_elem_size;
-        EXPECTED *expected
-            = (EXPECTED *)&((unsigned char *)package->encode_expectations)[pos];
-
-        switch (do_encode_custom(expected, &test_custom_data[i], package)) {
+        switch (do_encode_custom((EXPECTED *)&((unsigned char *)package
+                                               ->encode_expectations)[pos],
+                                 &test_custom_data[i], package)) {
         case -1:
-            if (expected->success) {
-                TEST_error("Failed custom encode round trip %u of %s",
-                           i, package->name);
-                TEST_openssl_errors();
-                fail++;
-            }
+            TEST_error("Failed custom encode round trip %u of %s",
+                       i, package->name);
+            TEST_openssl_errors();
+            fail++;
             break;
         case 0:
             TEST_error("Custom encode round trip %u of %s mismatch",
@@ -766,16 +763,16 @@ static int test_intern(const TEST_PACKAGE *package)
             OPENSSL_die("do_encode_custom() return unknown value",
                         __FILE__, __LINE__);
         }
-        switch (do_decode_custom(&test_custom_data[i], expected,
+        switch (do_decode_custom(&test_custom_data[i],
+                                 (EXPECTED *)&((unsigned char *)package
+                                               ->encode_expectations)[pos],
                                  package->encode_expectations_elem_size,
                                  package)) {
         case -1:
-            if (expected->success) {
-                TEST_error("Failed custom decode round trip %u of %s",
-                           i, package->name);
-                TEST_openssl_errors();
-                fail++;
-            }
+            TEST_error("Failed custom decode round trip %u of %s",
+                       i, package->name);
+            TEST_openssl_errors();
+            fail++;
             break;
         case 0:
             TEST_error("Custom decode round trip %u of %s mismatch",
@@ -795,17 +792,15 @@ static int test_intern(const TEST_PACKAGE *package)
     nelems = package->encdec_data_size / package->encdec_data_elem_size;
     for (i = 0; i < nelems; i++) {
         size_t pos = i * package->encdec_data_elem_size;
-        EXPECTED *expected
-            = (EXPECTED *)&((unsigned char *)package->encdec_data)[pos];
-
-        switch (do_enc_dec(expected, package->encdec_data_elem_size, package)) {
+        switch (do_enc_dec((EXPECTED *)&((unsigned char *)package
+                                         ->encdec_data)[pos],
+                           package->encdec_data_elem_size,
+                           package)) {
         case -1:
-            if (expected->success) {
-                TEST_error("Failed encode/decode round trip %u of %s",
-                           i, package->name);
-                TEST_openssl_errors();
-                fail++;
-            }
+            TEST_error("Failed encode/decode round trip %u of %s",
+                       i, package->name);
+            TEST_openssl_errors();
+            fail++;
             break;
         case 0:
             TEST_error("Encode/decode round trip %u of %s mismatch",