mirror of
https://github.com/ntop/n2n.git
synced 2024-04-21 16:31:34 +00:00
Simplify openssl library detection and macros
This commit is contained in:
+1
-1
@@ -34,7 +34,7 @@
|
||||
#define AES128_KEY_BYTES (128/8)
|
||||
|
||||
|
||||
#if defined (HAVE_OPENSSL_1_1) // openSSL 1.1 ---------------------------------------------------------------------
|
||||
#ifdef HAVE_LIBCRYPTO // openSSL 1.1 ---------------------------------------------------------------------
|
||||
|
||||
#include <openssl/aes.h>
|
||||
#include <openssl/evp.h>
|
||||
|
||||
+2
-2
@@ -23,14 +23,14 @@
|
||||
|
||||
#include <stddef.h> // for size_t
|
||||
#include <stdint.h> // for uint32_t, uint8_t
|
||||
#include "config.h" // HAVE_OPENSSL_1_1
|
||||
#include "config.h" // HAVE_LIBCRYPTO
|
||||
|
||||
|
||||
#define CC20_IV_SIZE 16
|
||||
#define CC20_KEY_BYTES (256/8)
|
||||
|
||||
|
||||
#ifdef HAVE_OPENSSL_1_1 // openSSL 1.1 ----------------------------------------------------------------------------
|
||||
#ifdef HAVE_LIBCRYPTO // openSSL 1.1 ----------------------------------------------------------------------------
|
||||
|
||||
|
||||
#include <openssl/evp.h>
|
||||
|
||||
+1
-1
@@ -85,7 +85,7 @@
|
||||
#include <zstd.h>
|
||||
#endif
|
||||
|
||||
#if defined (HAVE_OPENSSL_1_1)
|
||||
#ifdef HAVE_LIBCRYPTO
|
||||
#include <openssl/opensslv.h>
|
||||
#include <openssl/crypto.h>
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user