From 5a950960827770abc945a3d4943a684285de430b Mon Sep 17 00:00:00 2001 From: jsing Date: Sat, 30 Jul 2022 14:24:33 +0000 Subject: [PATCH] Less #ifndef OPENSSL_NO_* We're not going to be compiling without AES or CHACHA/POLY1305 anytime soon. --- regress/lib/libcrypto/aead/aeadtest.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/regress/lib/libcrypto/aead/aeadtest.c b/regress/lib/libcrypto/aead/aeadtest.c index 71b3a2f243d..50072de0e91 100644 --- a/regress/lib/libcrypto/aead/aeadtest.c +++ b/regress/lib/libcrypto/aead/aeadtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aeadtest.c,v 1.15 2022/07/30 14:09:00 jsing Exp $ */ +/* $OpenBSD: aeadtest.c,v 1.16 2022/07/30 14:24:33 jsing Exp $ */ /* * Copyright (c) 2014, Google Inc. * @@ -89,29 +89,13 @@ aead_from_name(const EVP_AEAD **aead, const char *name) *aead = NULL; if (strcmp(name, "aes-128-gcm") == 0) { -#ifndef OPENSSL_NO_AES *aead = EVP_aead_aes_128_gcm(); -#else - fprintf(stderr, "No AES support.\n"); -#endif } else if (strcmp(name, "aes-256-gcm") == 0) { -#ifndef OPENSSL_NO_AES *aead = EVP_aead_aes_256_gcm(); -#else - fprintf(stderr, "No AES support.\n"); -#endif } else if (strcmp(name, "chacha20-poly1305") == 0) { -#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) *aead = EVP_aead_chacha20_poly1305(); -#else - fprintf(stderr, "No chacha20-poly1305 support.\n"); -#endif } else if (strcmp(name, "xchacha20-poly1305") == 0) { -#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) *aead = EVP_aead_xchacha20_poly1305(); -#else - fprintf(stderr, "No xchacha20-poly1305 support.\n"); -#endif } else { fprintf(stderr, "Unknown AEAD: %s\n", name); return -1; -- 2.20.1