diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 12:46:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-21 13:14:14 -0400 |
| commit | 25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0 (patch) | |
| tree | 1c23ec9dd2cea5d00e4262fa4574ffdb9e250aa7 /src/common/compat_openssl.h | |
| parent | 49d7c9ce53daa13daae59eedceb07d28e06e4395 (diff) | |
| download | tor-25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0.tar.gz tor-25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0.zip | |
Split crypto and tls libraries into directories
I am calling the crypto library "crypt_ops", since I want
higher-level crypto things to be separated from lower-level ones.
This library will hold only the low-level ones, once we have it
refactored.
Diffstat (limited to 'src/common/compat_openssl.h')
| -rw-r--r-- | src/common/compat_openssl.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h deleted file mode 100644 index a94b264927..0000000000 --- a/src/common/compat_openssl.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (c) 2001, Matej Pfajfar. - * Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2018, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -#ifndef TOR_COMPAT_OPENSSL_H -#define TOR_COMPAT_OPENSSL_H - -#include <openssl/opensslv.h> -#include "common/crypto_openssl_mgt.h" - -/** - * \file compat_openssl.h - * - * \brief compatibility definitions for working with different openssl forks - **/ - -#if !defined(LIBRESSL_VERSION_NUMBER) && \ - OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(1,0,1) -#error "We require OpenSSL >= 1.0.1" -#endif - -#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && \ - ! defined(LIBRESSL_VERSION_NUMBER) -/* We define this macro if we're trying to build with the majorly refactored - * API in OpenSSL 1.1 */ -#define OPENSSL_1_1_API -#endif /* OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) && ... */ - -#ifndef OPENSSL_VERSION -#define OPENSSL_VERSION SSLEAY_VERSION -#endif - -#ifndef OPENSSL_1_1_API -#define OpenSSL_version(v) SSLeay_version(v) -#define OpenSSL_version_num() SSLeay() -#define RAND_OpenSSL() RAND_SSLeay() -#define STATE_IS_SW_SERVER_HELLO(st) \ - (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ - ((st) == SSL3_ST_SW_SRVR_HELLO_B)) -#define OSSL_HANDSHAKE_STATE int -#define CONST_IF_OPENSSL_1_1_API -#else /* !(!defined(OPENSSL_1_1_API)) */ -#define STATE_IS_SW_SERVER_HELLO(st) \ - ((st) == TLS_ST_SW_SRVR_HELLO) -#define CONST_IF_OPENSSL_1_1_API const -#endif /* !defined(OPENSSL_1_1_API) */ - -#endif /* !defined(TOR_COMPAT_OPENSSL_H) */ - |