From: Pauli <paul.dale@oracle.com>
Date: Thu, 16 Jan 2020 04:15:19 +0000 (+1000)
Subject: apps: Fix deprecation conditional in speed.c
X-Git-Tag: openssl-3.0.0-alpha1~642
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=08bff785fc2370f743ea5baabd44524412711ae8;p=oweals%2Fopenssl.git

apps: Fix deprecation conditional in speed.c

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10819)
---

diff --git a/apps/speed.c b/apps/speed.c
index 4883fe0936..9c896ec6f0 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1471,11 +1471,11 @@ int speed_main(int argc, char **argv)
 #if !defined(OPENSSL_NO_CAST) && !defined(OPENSSL_NO_DEPRECATED_3_0)
     CAST_KEY cast_ks;
 #endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
     static const unsigned char key16[16] = {
         0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
         0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12
     };
-#ifndef OPENSSL_NO_DEPRECATED_3_0
     static const unsigned char key24[24] = {
         0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0,
         0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0, 0x12,