Remove option to disable crypto engine
PATCH 1/7 Remove option to disable crypto engine
With this patch we remove the possibility to disable the crypto engine (ENABLE_CRYPTO define) at configuration time.
[Some unit-test are temporarily disabled and will be enabled again when ENABLE_CRYPTO is completely removed from the codebase]
[--disable-crypto has been removed from .travis.yml too]
Signed-off-by Antonio Quartulli <[email protected]...>
--- .travis.yml | 2 +- config-msvc.h | 1 - configure.ac | 33 ++++++---------------- doc/doxygen/openvpn.doxyfile.in | 2 +- .../keyingmaterialexporter.c | 2 -- sample/sample-plugins/log/log_v3.c | 2 -- tests/Makefile.am | 4 +-- tests/unit_tests/openvpn/Makefile.am | 4 +-- 8 files changed, 13 insertions(+), 37 deletions(-)
.travis.yml +1 -1
@@ -59,7 +59,7 @@ matrix: - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-crypto" EXTRA_SCRIPT="make distcheck" + - env: SSLLIB="openssl" EXTRA_SCRIPT="make distcheck" os: linux compiler: clang - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo"
config-msvc.h +0 -1
@@ -4,7 +4,6 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO 1#define ENABLE_CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1
configure.ac +9 -24
@@ -77,13 +77,6 @@ AC_ARG_ENABLE(comp-stub, [enable_comp_stub="no"] ) -AC_ARG_ENABLE( - [crypto], - [AS_HELP_STRING([--disable-crypto], [disable crypto support @<:@default=yes@:>@])], - , - [enable_crypto="yes"] -) - AC_ARG_ENABLE( [ofb-cfb], [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],
@@ -843,7 +836,7 @@ PKG_CHECK_MODULES( [] ) -if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then +if test "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])
@@ -958,11 +951,10 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) + AC_DEFINE([CRYPTO_OPENSSL], [1], [Use OpenSSL library]) CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then +elif test "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])
@@ -1041,11 +1033,10 @@ elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; th CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) + AC_DEFINE([CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -elif test "${enable_crypto}" = "yes"; then +else AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi
@@ -1245,14 +1236,10 @@ test "${enable_def_auth}" = "yes" && AC_DEFINE([ENABLE_DEF_AUTH], [1], [Enable d test "${enable_pf}" = "yes" && AC_DEFINE([ENABLE_PF], [1], [Enable internal packet filter]) test "${enable_strict_options}" = "yes" && AC_DEFINE([ENABLE_STRICT_OPTIONS_CHECK], [1], [Enable strict options check between peers]) -if test "${enable_crypto}" = "yes"; then - test "${have_crypto}" != "yes" && AC_MSG_ERROR([${with_crypto_library} crypto is required but missing]) - test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) - test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) - OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" - OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" - AC_DEFINE([ENABLE_CRYPTO], [1], [Enable crypto library]) -fi +test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) +test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) +OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" +OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" if test "${enable_plugins}" = "yes"; then OPTIONAL_DL_LIBS="${DL_LIBS}"
@@ -1292,7 +1279,6 @@ fi if test "${enable_pkcs11}" = "yes"; then test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing]) - test "${enable_crypto}" != "yes" && AC_MSG_ERROR([PKCS11 can be enabled only if crypto is enabled]) OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}" OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}" AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])
@@ -1372,7 +1358,6 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) -AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) AM_CONDITIONAL([HAVE_LD_WRAP_SUPPORT], [test "${have_ld_wrap_support}" = "yes"]) sampledir="\$(docdir)/sample"
doc/doxygen/openvpn.doxyfile.in +1 -1
@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------
sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +0 -2
@@ -27,8 +27,6 @@* See the README file for build instructions. */ -#define ENABLE_CRYPTO -#include <stdio.h> #include <string.h> #include <stdlib.h>
sample/sample-plugins/log/log_v3.c +0 -2
@@ -35,8 +35,6 @@#include <string.h> #include <stdlib.h> -#define ENABLE_CRYPTO -#include "openvpn-plugin.h" /*
tests/Makefile.am +1 -3
@@ -15,9 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -if ENABLE_CRYPTO -test_scripts += t_lpback.sh t_cltsrv.sh -endif +#test_scripts += t_lpback.sh t_cltsrv.sh TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)
tests/unit_tests/openvpn/Makefile.am +1 -3
@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO -check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif +#check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver TESTS = $(check_PROGRAMS)
Signature · 1 line
2.15.1
PATCH 2/7 Remove ENABLE_CRYPTO
The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
[re-enable unit-tests that were previously disabled]
Signed-off-by Antonio Quartulli <[email protected]...>
--- config-msvc.h | 2 +- doc/doxygen/doc_data_crypto.h | 12 ++-- doc/doxygen/openvpn.doxyfile.in | 2 +- include/openvpn-plugin.h.in | 15 ++--- src/openvpn/crypto.c | 6 +- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_backend.h | 4 +- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/forward-inline.h | 6 -- src/openvpn/forward.c | 15 ----- src/openvpn/init.c | 66 ++----------------- src/openvpn/manage.c | 5 +- src/openvpn/misc.c | 13 ---- src/openvpn/misc.h | 7 +- src/openvpn/openvpn.h | 24 ------- src/openvpn/options.c | 105 +++++++++--------------------- src/openvpn/options.h | 11 +--- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 - src/openvpn/pkcs11_mbedtls.c | 4 +- src/openvpn/pkcs11_openssl.c | 2 +- src/openvpn/plugin.c | 23 ++----- src/openvpn/plugin.h | 22 ++----- src/openvpn/reliable.c | 9 --- src/openvpn/reliable.h | 3 - src/openvpn/session_id.c | 9 --- src/openvpn/session_id.h | 3 - src/openvpn/ssl.c | 13 +--- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 9 +-- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 8 +-- src/openvpn/ssl_verify.c | 6 +- src/openvpn/ssl_verify.h | 8 +-- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 20 ++---- src/openvpn/tls_crypt.c | 3 - src/openvpn/tls_crypt.h | 4 -- tests/Makefile.am | 2 +- tests/unit_tests/openvpn/Makefile.am | 2 +- tests/unit_tests/openvpn/test_tls_crypt.c | 8 +-- 43 files changed, 99 insertions(+), 387 deletions(-)
config-msvc.h +1 -1
@@ -4,7 +4,7 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO_OPENSSL 1 +#define CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1#define ENABLE_FRAGMENT 1
doc/doxygen/doc_data_crypto.h +5 -7
@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external
doc/doxygen/openvpn.doxyfile.in +1 -1
@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------
include/openvpn-plugin.h.in +4 -11
@@ -26,21 +26,19 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED #define __OPENVPN_X509_CERT_T_DECLARED typedef mbedtls_x509_crt openvpn_x509_cert_t; #endif -#else /* ifdef ENABLE_CRYPTO_MBEDTLS */ +#else /* ifdef CRYPTO_MBEDTLS */ #include <openssl/x509.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED #define __OPENVPN_X509_CERT_T_DECLARED typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>
@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in
@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };
src/openvpn/crypto.c +1 -5
@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h"
@@ -430,7 +428,7 @@ openvpn_decrypt_aead(struct buffer *buf, struct buffer work, tag_ptr =BPTR (buf);ASSERT (buf_advance (buf, tag_size));dmsg (D_PACKET_CONTENT ,"DECRYPT MAC: %s" ,format_hex (tag_ptr, tag_size,0 , &gc)); -#if defined(ENABLE_CRYPTO_OPENSSL ) &&OPENSSL_VERSION_NUMBER <0x10001040L +#if defined(CRYPTO_OPENSSL ) &&OPENSSL_VERSION_NUMBER <0x10001040L /* OpenSSL <= 1.0.1c bug requires set tag before processing ciphertext */ if (!EVP_CIPHER_CTX_ctrl (ctx->cipher,EVP_CTRL_GCM_SET_TAG , tag_size, tag_ptr)) {
@@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */
src/openvpn/crypto.h +0 -4
@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h"
@@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */
src/openvpn/crypto_backend.h +2 -2
@@ -29,10 +29,10 @@#ifndef CRYPTO_BACKEND_H_ #define CRYPTO_BACKEND_H_ -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL #include "crypto_openssl.h" #endif -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #include "crypto_mbedtls.h" #endif #include "basic.h"
src/openvpn/crypto_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h"
@@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* CRYPTO_MBEDTLS */
src/openvpn/crypto_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h"
@@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* CRYPTO_OPENSSL */
src/openvpn/forward-inline.h +0 -6
@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/*
@@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);
@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/*
@@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */
@@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled
src/openvpn/forward.c +0 -15
@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {
@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP
@@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();
@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }
@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));
@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to.
@@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);
@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/*
@@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {
@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )
@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {
src/openvpn/init.c +4 -62
355 lines not on this page · raw message
src/openvpn/manage.c +1 -4
@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void
@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );
src/openvpn/misc.c +0 -13
@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov.
@@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */
src/openvpn/misc.h +1 -6
@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);
@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/*
src/openvpn/openvpn.h +0 -24
@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;
@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/*
@@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP
@@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */
@@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the
@@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \
@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
src/openvpn/options.c +30 -75
410 lines not on this page · raw message
src/openvpn/options.h +2 -9
@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /*
@@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(CRYPTO_OPENSSL ) && !defined(CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif
@@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;
@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;
@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;
@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */
@@ -599,7 +592,7 @@ struct optionsbool use_peer_id;uint32_t peer_id; -#if defined(ENABLE_CRYPTO_OPENSSL ) &&OPENSSL_VERSION_NUMBER >=0x10001000 +#if defined(CRYPTO_OPENSSL ) &&OPENSSL_VERSION_NUMBER >=0x10001000 /* Keying Material Exporters [RFC 5705] */ const char *keying_material_exporter_label;int keying_material_exporter_length;
src/openvpn/packet_id.c +0 -4
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h"
@@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */
src/openvpn/packet_id.h +0 -3
@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H
@@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/pkcs11_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_PKCS11 ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_PKCS11 ) && defined(CRYPTO_MBEDTLS )#include "errlevel.h" #include "pkcs11_backend.h"
@@ -129,4 +129,4 @@ cleanup: return ret; } -#endif /* defined(ENABLE_PKCS11) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_PKCS11) && defined(CRYPTO_MBEDTLS) */
src/openvpn/pkcs11_openssl.c +1 -1
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_PKCS11 ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_PKCS11 ) && defined(CRYPTO_OPENSSL )#include "errlevel.h" #include "pkcs11_backend.h"
src/openvpn/plugin.c +6 -17
@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;
@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;
@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)
@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {
src/openvpn/plugin.h +7 -15
@@ -28,10 +28,10 @@#ifndef OPENVPN_PLUGIN_H #define OPENVPN_PLUGIN_H -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL #include "ssl_verify_openssl.h" #endif -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #include "ssl_verify_mbedtls.h" #endif #include "openvpn-plugin.h"
@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);
@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;
@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */
src/openvpn/reliable.c +0 -9
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h"
@@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/reliable.h +0 -3
@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H
@@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.c +0 -9
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h"
@@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.h +0 -3
@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H
@@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.c +2 -11
@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h"
@@ -235,7 +233,7 @@ static const tls_cipher_name_pair tls_cipher_name_translation_table[] = { {"SRP-RSA-3DES-EDE-CBC-SHA", "TLS-SRP-SHA-RSA-WITH-3DES-EDE-CBC-SHA"}, {"SRP-RSA-AES-128-CBC-SHA", "TLS-SRP-SHA-RSA-WITH-AES-128-CBC-SHA"}, {"SRP-RSA-AES-256-CBC-SHA", "TLS-SRP-SHA-RSA-WITH-AES-256-CBC-SHA"}, -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL/* OpenSSL-specific group names */ {"DEFAULT", "DEFAULT"}, {"ALL", "ALL"},
@@ -716,7 +714,7 @@ init_ssl(const struct options *options, struct tls_root_ctx *new_ctx)tls_ctx_load_ecdh_params (new_ctx, options->ecdh_curve); } -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS /* Personalise the random by mixing in the certificate */ tls_ctx_personalise_random (new_ctx);#endif
@@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.h +0 -4
@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h"
@@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */
src/openvpn/ssl_backend.h +3 -6
@@ -32,12 +32,12 @@#include "buffer.h" -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL #include "ssl_openssl.h" #include "ssl_verify_openssl.h" #define SSLAPI SSLAPI_OPENSSL#endif -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #include "ssl_mbedtls.h" #include "ssl_verify_mbedtls.h" #define SSLAPI SSLAPI_MBEDTLS
@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. *
@@ -322,7 +320,7 @@ void tls_ctx_load_extra_certs(struct tls_root_ctx *ctx, const char *extra_certs_const char *extra_certs_file_inline ); -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS /** * Add a personalisation string to the mbed TLS RNG, based on the certificate * loaded into the given context.
@@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */
src/openvpn/ssl_mbedtls.c +2 -2
@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h"
@@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(CRYPTO_MBEDTLS) */
src/openvpn/ssl_openssl.c +4 -4
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h"
@@ -1617,13 +1617,13 @@ key_state_write_plaintext(struct key_state_ssl *ks_ssl, struct buffer *buf)int ret =0 ;perf_push (PERF_BIO_WRITE_PLAINTEXT ); -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL ASSERT (NULL != ks_ssl); ret =bio_write (ks_ssl->ssl_bio,BPTR (buf),BLEN (buf),"tls_write_plaintext" );bio_write_post (ret, buf); -#endif /* ENABLE_CRYPTO_OPENSSL */ +#endif /* CRYPTO_OPENSSL */ perf_pop ();return ret;
@@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(CRYPTO_OPENSSL) */
src/openvpn/ssl_verify.c +1 -5
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h"
@@ -43,7 +41,7 @@#include "ssl_verify.h" #include "ssl_verify_backend.h" -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL #include "ssl_verify_openssl.h" #endif
@@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl_verify.h +2 -6
@@ -29,17 +29,15 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h" /* Include OpenSSL-specific code */ -#ifdef ENABLE_CRYPTO_OPENSSL +#ifdef CRYPTO_OPENSSL #include "ssl_verify_openssl.h" #endif -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #include "ssl_verify_mbedtls.h" #endif
@@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */
src/openvpn/ssl_verify_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h"
@@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(CRYPTO_MBEDTLS) */
src/openvpn/ssl_verify_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(CRYPTO_OPENSSL )#include "ssl_verify_openssl.h"
@@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(CRYPTO_OPENSSL) */
src/openvpn/syshead.h +5 -15
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0
@@ -550,14 +550,14 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif /* Enable mbed TLS RNG prediction resistance support */ -#ifdef ENABLE_CRYPTO_MBEDTLS +#ifdef CRYPTO_MBEDTLS #define ENABLE_PREDICTION_RESISTANCE -#endif /* ENABLE_CRYPTO_MBEDTLS */ +#endif /* CRYPTO_MBEDTLS */ /* * MANAGEMENT_IN_EXTRA allows the management interface to
@@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif
@@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support
src/openvpn/tls_crypt.c +0 -3
@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h"
@@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */
src/openvpn/tls_crypt.h +0 -4
@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h"
@@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */
tests/Makefile.am +1 -1
@@ -15,7 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -#test_scripts += t_lpback.sh t_cltsrv.sh +test_scripts += t_lpback.sh t_cltsrv.sh TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)
tests/unit_tests/openvpn/Makefile.am +1 -1
@@ -6,7 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -#check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver +check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver TESTS = $(check_PROGRAMS)
tests/unit_tests/openvpn/test_tls_crypt.c +2 -6
@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h>
@@ -256,17 +254,15 @@ main(void) { setup, teardown), }; -#if defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(CRYPTO_OPENSSL )OpenSSL_add_all_algorithms ();#endif int ret =cmocka_run_group_tests_name ("tls-crypt tests" , tests,NULL ,NULL ); -#if defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(CRYPTO_OPENSSL )EVP_cleanup ();#endif return ret; } - -#endif /* ENABLE_CRYPTO */
Signature · 1 line
2.15.1
PATCH v2 2/7 Remove option to disable crypto engine
With this patch we remove the possibility to disable the crypto engine (ENABLE_CRYPTO define) at configuration time.
[--disable-crypto has been removed from .travis.yml too]
Signed-off-by Antonio Quartulli <[email protected]...>
---
v2:
- .travis.yml: move "make distcheck" to other entry in the matrix
- move to second spot in the set to avoid having a point in the tree where encryption is not enabled
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL in configure.ac
.travis.yml | 5 +--- config-msvc.h | 1 - configure.ac | 29 ++++++---------------- doc/doxygen/openvpn.doxyfile.in | 2 +- .../keyingmaterialexporter.c | 2 -- sample/sample-plugins/log/log_v3.c | 2 -- tests/Makefile.am | 2 -- 7 files changed, 9 insertions(+), 34 deletions(-)
.travis.yml +1 -4
@@ -59,10 +59,7 @@ matrix: - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-crypto" EXTRA_SCRIPT="make distcheck" - os: linux - compiler: clang - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" + - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" os: linux compiler: clang - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"
config-msvc.h +0 -1
@@ -4,7 +4,6 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO 1#define ENABLE_CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1
configure.ac +7 -22
@@ -77,13 +77,6 @@ AC_ARG_ENABLE(comp-stub, [enable_comp_stub="no"] ) -AC_ARG_ENABLE( - [crypto], - [AS_HELP_STRING([--disable-crypto], [disable crypto support @<:@default=yes@:>@])], - , - [enable_crypto="yes"] -) - AC_ARG_ENABLE( [ofb-cfb], [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],
@@ -843,7 +836,7 @@ PKG_CHECK_MODULES( [] ) -if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then +if test "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])
@@ -958,11 +951,10 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then +elif test "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])
@@ -1041,11 +1033,10 @@ elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; th CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -elif test "${enable_crypto}" = "yes"; then +else AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi
@@ -1245,14 +1236,10 @@ test "${enable_def_auth}" = "yes" && AC_DEFINE([ENABLE_DEF_AUTH], [1], [Enable d test "${enable_pf}" = "yes" && AC_DEFINE([ENABLE_PF], [1], [Enable internal packet filter]) test "${enable_strict_options}" = "yes" && AC_DEFINE([ENABLE_STRICT_OPTIONS_CHECK], [1], [Enable strict options check between peers]) -if test "${enable_crypto}" = "yes"; then - test "${have_crypto}" != "yes" && AC_MSG_ERROR([${with_crypto_library} crypto is required but missing]) - test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) - test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) - OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" - OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" - AC_DEFINE([ENABLE_CRYPTO], [1], [Enable crypto library]) -fi +test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) +test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) +OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" +OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" if test "${enable_plugins}" = "yes"; then OPTIONAL_DL_LIBS="${DL_LIBS}"
@@ -1292,7 +1279,6 @@ fi if test "${enable_pkcs11}" = "yes"; then test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing]) - test "${enable_crypto}" != "yes" && AC_MSG_ERROR([PKCS11 can be enabled only if crypto is enabled]) OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}" OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}" AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])
@@ -1372,7 +1358,6 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) -AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) AM_CONDITIONAL([HAVE_LD_WRAP_SUPPORT], [test "${have_ld_wrap_support}" = "yes"]) sampledir="\$(docdir)/sample"
doc/doxygen/openvpn.doxyfile.in +1 -1
@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------
sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +0 -2
@@ -27,8 +27,6 @@* See the README file for build instructions. */ -#define ENABLE_CRYPTO -#include <stdio.h> #include <string.h> #include <stdlib.h>
sample/sample-plugins/log/log_v3.c +0 -2
@@ -35,8 +35,6 @@#include <string.h> #include <stdlib.h> -#define ENABLE_CRYPTO -#include "openvpn-plugin.h" /*
tests/Makefile.am +0 -2
@@ -15,9 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -if ENABLE_CRYPTO test_scripts += t_lpback.sh t_cltsrv.sh -endif TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)
Signature · 1 line
2.15.1
Hi,
Quoted 184 lines · Antonio Quartulli
With this patch we remove the possibility to disable the crypto engine (
ENABLE_CRYPTOdefine) at configuration time.[--disable-crypto has been removed from .travis.yml too]
Signed-off-by Antonio Quartulli <[email protected]...>---
v2:
- .travis.yml: move "make distcheck" to other entry in the matrix
- move to second spot in the set to avoid having a point in the tree where encryption is not enabled
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL in configure.ac.travis.yml | 5 +--- config-msvc.h | 1 - configure.ac | 29 ++++++---------------- doc/doxygen/openvpn.doxyfile.in | 2 +- .../keyingmaterialexporter.c | 2 -- sample/sample-plugins/log/log_v3.c | 2 -- tests/Makefile.am | 2 -- 7 files changed, 9 insertions(+), 34 deletions(-).travis.yml +1
-4@@ -59,10 +59,7 @@ matrix: - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-crypto" EXTRA_SCRIPT="make distcheck" - os: linux - compiler: clang - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" + - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo" EXTRA_SCRIPT="make distcheck" os: linux compiler: clang - env: SSLLIB="openssl" EXTRA_CONFIG="--enable-small"config-msvc.h +0
-1@@ -4,7 +4,6 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO 1#define ENABLE_CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1configure.ac +7
-22@@ -77,13 +77,6 @@ AC_ARG_ENABLE(comp-stub, [enable_comp_stub="no"] ) -AC_ARG_ENABLE( - [crypto], - [AS_HELP_STRING([--disable-crypto], [disable crypto support @<:@default=yes@:>@])], - , - [enable_crypto="yes"] -) - AC_ARG_ENABLE( [ofb-cfb], [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],@@ -843,7 +836,7 @@ PKG_CHECK_MODULES( [] ) -if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then +if test "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])@@ -958,11 +951,10 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then +elif test "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])@@ -1041,11 +1033,10 @@ elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; th CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -elif test "${enable_crypto}" = "yes"; then +else AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi@@ -1245,14 +1236,10 @@ test "${enable_def_auth}" = "yes" && AC_DEFINE([ENABLE_DEF_AUTH], [1], [Enable d test "${enable_pf}" = "yes" && AC_DEFINE([ENABLE_PF], [1], [Enable internal packet filter]) test "${enable_strict_options}" = "yes" && AC_DEFINE([ENABLE_STRICT_OPTIONS_CHECK], [1], [Enable strict options check between peers]) -if test "${enable_crypto}" = "yes"; then - test "${have_crypto}" != "yes" && AC_MSG_ERROR([${with_crypto_library} crypto is required but missing]) - test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) - test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) - OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" - OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" - AC_DEFINE([ENABLE_CRYPTO], [1], [Enable crypto library]) -fi +test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) +test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) +OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" +OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" if test "${enable_plugins}" = "yes"; then OPTIONAL_DL_LIBS="${DL_LIBS}"@@ -1292,7 +1279,6 @@ fi if test "${enable_pkcs11}" = "yes"; then test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing]) - test "${enable_crypto}" != "yes" && AC_MSG_ERROR([PKCS11 can be enabled only if crypto is enabled]) OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}" OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}" AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])@@ -1372,7 +1358,6 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) -AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) AM_CONDITIONAL([HAVE_LD_WRAP_SUPPORT], [test "${have_ld_wrap_support}" = "yes"]) sampledir="\$(docdir)/sample"doc/doxygen/openvpn.doxyfile.in +1
-1@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +0
-2@@ -27,8 +27,6 @@* See the README file for build instructions. */ -#define ENABLE_CRYPTO -#include <stdio.h> #include <string.h> #include <stdlib.h> sample/sample-plugins/log/log_v3.c +0
-2@@ -35,8 +35,6 @@#include <string.h> #include <stdlib.h> -#define ENABLE_CRYPTO -#include "openvpn-plugin.h" /* tests/Makefile.am +0
-0
tests/Makefile.am MAINTAINERCLEANFILES = \ · line 21
Quoted 9 lines
tests/Makefile.am +0
-2@@ -15,9 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -if ENABLE_CRYPTO test_scripts += t_lpback.sh t_cltsrv.sh -endif TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)
-Steffan
Your patch has been applied to the master branch.
commit cf49ff503125df08c8ba697c5e0a896fed192e46
Author: Antonio Quartulli Date: Sun Dec 3 20:49:52 2017 +0800
Remove option to disable crypto engine
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg15979.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 3/7 Remove ENABLE_PUSH_PEER_INFO
In reply to Antonio QuartulliENABLE_PUSH_PEER_INFO depended on ENABLE_CRYPTO that now does not exist anymore.
Get rid of ENABLE_PUSH_PEER_INFO by assuming that it is always enabled and simplify the code.
Signed-off-by Antonio Quartulli <[email protected]...>
--- src/openvpn/init.c | 2 -- src/openvpn/options.c | 10 ---------- src/openvpn/options.h | 2 -- src/openvpn/ssl.c | 2 -- src/openvpn/ssl_common.h | 2 -- src/openvpn/syshead.h | 5 ----- 6 files changed, 23 deletions(-)
src/openvpn/init.c +0 -2
@@ -2686,7 +2686,6 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.single_session = options->single_session; to.mode = options->mode; to.pull = options->pull; -#ifdef ENABLE_PUSH_PEER_INFO if (options->push_peer_info)/* all there is */ { to.push_peer_info_detail =2 ;
@@ -2699,7 +2698,6 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) { to.push_peer_info_detail =0 ; } -#endif /* should we not xmit any packets until we get an initial * response from client? */
src/openvpn/options.c +0 -10
@@ -225,9 +225,7 @@ static const char usage_message[] ="--redirect-private [flags]: Like --redirect-gateway, but omit actually changing\n" " the default gateway. Useful when pushing private subnets.\n" "--client-nat snat|dnat network netmask alias : on client add 1-to-1 NAT rule.\n" -#ifdef ENABLE_PUSH_PEER_INFO"--push-peer-info : (client only) push client info to server.\n" -#endif"--setenv name value : Set a custom environmental variable to pass to script.\n" "--setenv FORWARD_COMPATIBLE 1 : Relax config file syntax checking to allow\n" " directives for future OpenVPN versions to be ignored.\n"
@@ -1772,9 +1770,7 @@ show_settings(const struct options *o)SHOW_INT (transition_window);SHOW_BOOL (single_session); -#ifdef ENABLE_PUSH_PEER_INFO SHOW_BOOL (push_peer_info); -#endif SHOW_BOOL (tls_exit);SHOW_STR (tls_auth_file);
@@ -2732,9 +2728,7 @@ options_postprocess_verify_ce(const struct options *options, const struct connecMUST_BE_UNDEF (tls_auth_file);MUST_BE_UNDEF (tls_crypt_file);MUST_BE_UNDEF (single_session); -#ifdef ENABLE_PUSH_PEER_INFO MUST_BE_UNDEF (push_peer_info); -#endif MUST_BE_UNDEF (tls_exit);MUST_BE_UNDEF (crl_file);MUST_BE_UNDEF (key_method);
@@ -6344,12 +6338,10 @@ add_option(struct options *options,msg (msglevel,"this is a generic configuration and cannot directly be used" ); goto err; } -#ifdef ENABLE_PUSH_PEER_INFO else if (streq (p[1 ],"PUSH_PEER_INFO" ) && !p[2 ]) { options->push_peer_info = true; } -#endif else if (streq (p[1 ],"SERVER_POLL_TIMEOUT" ) && p[2 ]) { options->ce.connect_timeout =positive_atoi (p[2 ]);
@@ -7778,13 +7770,11 @@ add_option(struct options *options,VERIFY_PERMISSION (OPT_P_GENERAL ); options->single_session = true; } -#ifdef ENABLE_PUSH_PEER_INFO else if (streq (p[0 ],"push-peer-info" ) && !p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->push_peer_info = true; } -#endif else if (streq (p[0 ],"tls-exit" ) && !p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL );
src/openvpn/options.h +0 -2
@@ -569,9 +569,7 @@ struct options/* Allow only one session */ bool single_session; -#ifdef ENABLE_PUSH_PEER_INFO bool push_peer_info; -#endif bool tls_exit;
src/openvpn/ssl.c +0 -2
@@ -2235,7 +2235,6 @@ push_peer_info(struct buffer *buf, struct tls_session *session)struct gc_arena gc =gc_new ();bool ret = false; -#ifdef ENABLE_PUSH_PEER_INFO if (session->opt->push_peer_info_detail >0 ) {struct env_set *es = session->opt->es;
@@ -2316,7 +2315,6 @@ push_peer_info(struct buffer *buf, struct tls_session *session) } }else -#endif /* ifdef ENABLE_PUSH_PEER_INFO */ {if (!write_empty_string (buf))/* no peer info */ {
src/openvpn/ssl_common.h +0 -2
@@ -249,9 +249,7 @@ struct tls_options#endif int mode;bool pull; -#ifdef ENABLE_PUSH_PEER_INFO int push_peer_info_detail; -#endif int transition_window;int handshake_window;interval_t packet_timeout;
src/openvpn/syshead.h +0 -5
@@ -673,11 +673,6 @@ socket_defined(const socket_descriptor_t sd)#define ENABLE_CLIENT_CR #endif -/* -* Do we support pushing peer info? -*/ -#define ENABLE_PUSH_PEER_INFO -/* * Compression support */
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH 3/7] Remove ENABLE_PUSH_PEER_INFO
Hi,
Quoted 151 lines · Antonio Quartulli
ENABLE_PUSH_PEER_INFOdepended onENABLE_CRYPTOthat now does not exist anymore.
Get rid ofENABLE_PUSH_PEER_INFOby assuming that it is always enabled and simplify the code.Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/init.c | 2 -- src/openvpn/options.c | 10 ---------- src/openvpn/options.h | 2 -- src/openvpn/ssl.c | 2 -- src/openvpn/ssl_common.h | 2 -- src/openvpn/syshead.h | 5 ----- 6 files changed, 23 deletions(-)src/openvpn/init.c +0
-2@@ -2686,7 +2686,6 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.single_session = options->single_session; to.mode = options->mode; to.pull = options->pull; -#ifdef ENABLE_PUSH_PEER_INFO if (options->push_peer_info)/* all there is */ { to.push_peer_info_detail =2 ;@@ -2699,7 +2698,6 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) { to.push_peer_info_detail =0 ; } -#endif /* should we not xmit any packets until we get an initial * response from client? */ src/openvpn/options.c +0
-10@@ -225,9 +225,7 @@ static const char usage_message[] ="--redirect-private [flags]: Like --redirect-gateway, but omit actually changing\n" " the default gateway. Useful when pushing private subnets.\n" "--client-nat snat|dnat network netmask alias : on client add 1-to-1 NAT rule.\n" -#ifdef ENABLE_PUSH_PEER_INFO"--push-peer-info : (client only) push client info to server.\n" -#endif"--setenv name value : Set a custom environmental variable to pass to script.\n" "--setenv FORWARD_COMPATIBLE 1 : Relax config file syntax checking to allow\n" " directives for future OpenVPN versions to be ignored.\n" @@ -1772,9 +1770,7 @@ show_settings(const struct options *o)SHOW_INT (transition_window);SHOW_BOOL (single_session); -#ifdef ENABLE_PUSH_PEER_INFO SHOW_BOOL (push_peer_info); -#endif SHOW_BOOL (tls_exit);SHOW_STR (tls_auth_file);@@ -2732,9 +2728,7 @@ options_postprocess_verify_ce(const struct options *options, const struct connecMUST_BE_UNDEF (tls_auth_file);MUST_BE_UNDEF (tls_crypt_file);MUST_BE_UNDEF (single_session); -#ifdef ENABLE_PUSH_PEER_INFO MUST_BE_UNDEF (push_peer_info); -#endif MUST_BE_UNDEF (tls_exit);MUST_BE_UNDEF (crl_file);MUST_BE_UNDEF (key_method);@@ -6344,12 +6338,10 @@ add_option(struct options *options,msg (msglevel,"this is a generic configuration and cannot directly be used" ); goto err; } -#ifdef ENABLE_PUSH_PEER_INFO else if (streq (p[1 ],"PUSH_PEER_INFO" ) && !p[2 ]) { options->push_peer_info = true; } -#endif else if (streq (p[1 ],"SERVER_POLL_TIMEOUT" ) && p[2 ]) { options->ce.connect_timeout =positive_atoi (p[2 ]);@@ -7778,13 +7770,11 @@ add_option(struct options *options,VERIFY_PERMISSION (OPT_P_GENERAL ); options->single_session = true; } -#ifdef ENABLE_PUSH_PEER_INFO else if (streq (p[0 ],"push-peer-info" ) && !p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL ); options->push_peer_info = true; } -#endif else if (streq (p[0 ],"tls-exit" ) && !p[1 ]) {VERIFY_PERMISSION (OPT_P_GENERAL );src/openvpn/options.h +0
-2@@ -569,9 +569,7 @@ struct options/* Allow only one session */ bool single_session; -#ifdef ENABLE_PUSH_PEER_INFO bool push_peer_info; -#endif bool tls_exit;src/openvpn/ssl.c +0
-2@@ -2235,7 +2235,6 @@ push_peer_info(struct buffer *buf, struct tls_session *session)struct gc_arena gc =gc_new ();bool ret = false; -#ifdef ENABLE_PUSH_PEER_INFO if (session->opt->push_peer_info_detail >0 ) {struct env_set *es = session->opt->es;@@ -2316,7 +2315,6 @@ push_peer_info(struct buffer *buf, struct tls_session *session) } }else -#endif /* ifdef ENABLE_PUSH_PEER_INFO */ {if (!write_empty_string (buf))/* no peer info */ {src/openvpn/ssl_common.h +0
-2@@ -249,9 +249,7 @@ struct tls_options#endif int mode;bool pull; -#ifdef ENABLE_PUSH_PEER_INFO int push_peer_info_detail; -#endif int transition_window;int handshake_window;interval_t packet_timeout;src/openvpn/syshead.h +0
-0@@ -673,11 +673,6 @@ socket_defined(const socket_descriptor_t sd)#define ENABLE_CLIENT_CR
src/openvpn/syshead.h socket_defined(const socket_descriptor_t sd) · line 678
Quoted 10 lines
src/openvpn/syshead.h +0
-5#endif -/* -* Do we support pushing peer info? -*/ -#define ENABLE_PUSH_PEER_INFO -/* * Compression support */
-Steffan
[Openvpn-devel] [PATCH applied] Re: Remove ENABLE_PUSH_PEER_INFO
In reply to Antonio QuartulliYour patch has been applied to the master branch.
commit d16529483d72871e1812f8f974f456867f5021d1
Author: Antonio Quartulli Date: Sat Dec 2 21:45:37 2017 +0800
Remove ENABLE_PUSH_PEER_INFO
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg15953.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 4/7 Remove SSL_LIB_VER_STR
In reply to Antonio QuartulliSSL_LIB_VER_STR made sense only when ENABLE_CRYPTO also existed. It can now be removed and thus simplify the code.
Signed-off-by Antonio Quartulli <[email protected]...>
--- src/openvpn/options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
src/openvpn/options.c +2 -3
@@ -4087,16 +4087,15 @@ show_windows_version(const unsigned int flags)void show_library_versions (const unsigned int flags) { -#define SSL_LIB_VER_STR get_ssl_library_version()#ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string()#else #define LZO_LIB_VER_STR "", ""#endif -msg (flags,"library versions: %s%s%s" ,SSL_LIB_VER_STR ,LZO_LIB_VER_STR ); +msg (flags,"library versions: %s%s%s" ,get_ssl_library_version (), +LZO_LIB_VER_STR ); -#undef SSL_LIB_VER_STR#undef LZO_LIB_VER_STR }
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH 4/7] Remove SSL_LIB_VER_STR
Hi,
Quoted 21 lines · Antonio Quartulli
SSL_LIB_VER_STRmade sense only whenENABLE_CRYPTOalso existed. It can now be removed and thus simplify the code.Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)src/openvpn/options.c +0
-1@@ -4087,16 +4087,15 @@ show_windows_version(const unsigned int flags)void show_library_versions (const unsigned int flags) { -#define SSL_LIB_VER_STR get_ssl_library_version()#ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string()#else #define LZO_LIB_VER_STR "", ""
src/openvpn/options.c show_windows_version(const unsigned int flags) · line 4101
Quoted 10 lines
src/openvpn/options.c +2
-2#endif -msg (flags,"library versions: %s%s%s" ,SSL_LIB_VER_STR ,LZO_LIB_VER_STR ); +msg (flags,"library versions: %s%s%s" ,get_ssl_library_version (), +LZO_LIB_VER_STR ); -#undef SSL_LIB_VER_STR#undef LZO_LIB_VER_STR }
Yes, better.
-Steffan
[Openvpn-devel] [PATCH applied] Re: Remove SSL_LIB_VER_STR
In reply to Antonio QuartulliYour patch has been applied to the master branch.
commit ca78395352e90c5b30015e23f1918a72a6c4a6ab
Author: Antonio Quartulli Date: Sat Dec 2 21:45:38 2017 +0800
Remove SSL_LIB_VER_STR
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg15951.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 5/7 Remove CIPHER_ENABLED
In reply to Antonio QuartulliNow that ENABLE_CRYPTO has been removed, CIPHER_ENABLED is basically a useless shortcut which does not really help the readability of the code.
Remove it and use its expanded expression instead.
Signed-off-by Antonio Quartulli <[email protected]...>
--- src/openvpn/init.c | 4 ++-- src/openvpn/openvpn.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
src/openvpn/init.c +2 -2
@@ -2379,7 +2379,7 @@ frame_finalize_options(struct context *c, const struct options *o)* Set adjustment factor for buffer alignment when no * cipher is used. */ -if (!CIPHER_ENABLED (c)) +if (!c->c1.ks.key_type.cipher) {frame_align_to_extra_frame (&c->c2.frame); frame_or_align_flags(&c->c2.frame,
@@ -2904,7 +2904,7 @@ do_init_frame(struct context *c)* flexible enough for this, since the frame is already established * before it is known which compression options will be pushed. */ -if (comp_unswapped_prefix (&c->options.comp) &&CIPHER_ENABLED (c)) +if (comp_unswapped_prefix (&c->options.comp) && c->c1.ks.key_type.cipher) {frame_add_to_align_adjust (&c->c2.frame,COMP_PREFIX_LEN ); frame_or_align_flags(&c->c2.frame,
src/openvpn/openvpn.h +0 -2
@@ -565,8 +565,6 @@ struct context gc)#define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -/* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH 5/7] Remove CIPHER_ENABLED
Quoted 39 lines · Antonio Quartulli
Now that
ENABLE_CRYPTOhas been removed,CIPHER_ENABLEDis basically a useless shortcut which does not really help the readability of the code.Remove it and use its expanded expression instead.
Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/init.c | 4 ++-- src/openvpn/openvpn.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)src/openvpn/init.c +2
-2@@ -2379,7 +2379,7 @@ frame_finalize_options(struct context *c, const struct options *o)* Set adjustment factor for buffer alignment when no * cipher is used. */ -if (!CIPHER_ENABLED (c)) +if (!c->c1.ks.key_type.cipher) {frame_align_to_extra_frame (&c->c2.frame); frame_or_align_flags(&c->c2.frame,@@ -2904,7 +2904,7 @@ do_init_frame(struct context *c)* flexible enough for this, since the frame is already established * before it is known which compression options will be pushed. */ -if (comp_unswapped_prefix (&c->options.comp) &&CIPHER_ENABLED (c)) +if (comp_unswapped_prefix (&c->options.comp) && c->c1.ks.key_type.cipher) {frame_add_to_align_adjust (&c->c2.frame,COMP_PREFIX_LEN ); frame_or_align_flags(&c->c2.frame,src/openvpn/openvpn.h +0
-0
src/openvpn/openvpn.h struct context · line 570
Quoted 8 lines
src/openvpn/openvpn.h +0
-2@@ -565,8 +565,6 @@ struct context gc)#define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -/* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
-Steffan
Re: [Openvpn-devel] [PATCH 5/7] Remove CIPHER_ENABLED
Hi,
Quoted 4 lines · Steffan Karger
Quoted 3 lines · Antonio Quartulli
Now that
ENABLE_CRYPTOhas been removed,CIPHER_ENABLEDis basically a useless shortcut which does not really help the readability of the code.
Call me silly, but CIPHER_ENABLED has nothing to do with ENABLE_CRYPTO, but more with "--cipher none", no?
So at least the commit message is misleading...
Quoted 5 lines
src/openvpn/init.c frame_finalize_options(struct context *c, const struct options *o) · line 2382
Quoted 5 lines
* Set adjustment factor for buffer alignment when no
* cipher is used.
*/src/openvpn/init.c +1
-1-if (!CIPHER_ENABLED (c)) +if (!c->c1.ks.key_type.cipher)
... and I don't really find the second one more easily understandable than the first one...
gert
Signature · 3 lines
now what should I write here... Gert Doering - Munich, Germany [email protected]...
Re: [Openvpn-devel] [PATCH 5/7] Remove CIPHER_ENABLED
Hi,
Quoted 11 lines · Gert Doering
Hi,
Quoted 4 lines · Steffan Karger
Quoted 3 lines · Antonio Quartulli
Now that
ENABLE_CRYPTOhas been removed,CIPHER_ENABLEDis basically a useless shortcut which does not really help the readability of the code.Call me silly, but
CIPHER_ENABLEDhas nothing to do withENABLE_CRYPTO, but more with "--cipher none", no?
"Remove ENABLE_CRYPTO" introduced this change:
-#ifdef ENABLE_CRYPTO
#define CIPHER_ENABLED(c) (c->c1.ks.key_type.cipher != NULL)
-#else
-#define CIPHER_ENABLED(c) (false)
-#endif
thus my feeling was that this macro is now not so useful, because there is no conditional definition anymore.
Quoted 11 lines
So at least the commit message is misleading...
Quoted 5 lines
src/openvpn/init.c frame_finalize_options(struct context *c, const struct options *o) · line 2382
Quoted 5 lines
* Set adjustment factor for buffer alignment when no
* cipher is used.
*/src/openvpn/init.c +1
-1-if (!CIPHER_ENABLED (c)) +if (!c->c1.ks.key_type.cipher)... and I don't really find the second one more easily understandable than the first one...
I think it's a matter of taste :-)
We could substitute every NULL check with a human readable macro/inline-functions, but I am not sure it would be really useful.
Honestly, this condition seem quite clear to me (at least compared to the TLS_MODE()/tls_multi one).
But, again, this is just my taste: feel free to drop this patch if you think it is better to keep the macro.
Cheers,
Signature · 1 line
Antonio Quartulli
PATCH 6/7 Remove MD5SUM
In reply to Antonio QuartulliApparently the MS5SUM macro is not used anywhere.
Remove it.
Signed-off-by Antonio Quartulli <[email protected]...>
--- src/openvpn/openvpn.h | 1 - 1 file changed, 1 deletion(-)
src/openvpn/openvpn.h +0 -1
@@ -563,7 +563,6 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc))/* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH 6/7] Remove MD5SUM
Quoted 14 lines · Antonio Quartulli
Apparently the MS5SUM macro is not used anywhere.
Remove it.Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/openvpn.h | 1 - 1 file changed, 1 deletion(-)src/openvpn/openvpn.h +0
-0
src/openvpn/openvpn.h struct context · line 568
Quoted 7 lines
src/openvpn/openvpn.h +0
-1@@ -563,7 +563,6 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc))/* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
-Steffan
[Openvpn-devel] [PATCH applied] Re: Remove MD5SUM
In reply to Antonio QuartulliYour patch has been applied to the master branch.
commit 5a0e82cb73ce072ef6cedc629d698cf873923bf6
Author: Antonio Quartulli Date: Sat Dec 2 21:45:40 2017 +0800
Remove MD5SUM
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg15954.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 7/7 Remove TLS_MODE
In reply to Antonio QuartulliNow that ENABLE_CRYPTO has been removed, TLS_MODE is basically a useless shortcut which does not really help the readability of the code.
Remove it and use its expanded expression instead.
Signed-off-by Antonio Quartulli <[email protected]...>
--- src/openvpn/forward.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/occ.c | 3 ++- src/openvpn/openvpn.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-)
src/openvpn/forward.c +1 -1
@@ -948,7 +948,7 @@ process_incoming_link_part2(struct context *c, struct link_socket_info *lsi, con* * Also, update the persisted version of our packet-id. */ -if (!TLS_MODE (c)) +if (!c->c2.tls_multi) {link_socket_set_outgoing_addr (&c->c2.buf, lsi, &c->c2.from,NULL , c->c2.es); }
src/openvpn/init.c +1 -1
@@ -1306,7 +1306,7 @@ do_init_timers(struct context *c, bool deferred)/* initialize occ timers */ if (c->options.occ - && !TLS_MODE (c) + && !c->c2.tls_multi && c->c2.options_string_local && c->c2.options_string_remote) {event_timeout_init (&c->c2.occ_interval,OCC_INTERVAL_SECONDS , now);
src/openvpn/occ.c +2 -1
@@ -378,7 +378,8 @@ process_received_occ_msg(struct context *c)case OCC_REPLY :dmsg (D_PACKET_CONTENT ,"RECEIVED OCC_REPLY" ); - if (c->options.occ && !TLS_MODE(c) && c->c2.options_string_remote) + if (c->options.occ && !c->c2.tls_multi + && c->c2.options_string_remote) { if (!options_cmp_equal_safe((char *) BPTR(&c->c2.buf), c->c2.options_string_remote,
src/openvpn/openvpn.h +0 -1
@@ -556,7 +556,6 @@ struct context* have been compiled in. */ -#define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \ PROTO_DUMP_FLAGS \
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH 7/7] Remove TLS_MODE
Hi,
Quoted 3 lines · Antonio Quartulli
Now that
ENABLE_CRYPTOhas been removed,TLS_MODEis basically a useless shortcut which does not really help the readability of the code.
So I don't really agree here. As we've just experienced while discussing this on IRC, the meaning of 'c->c2.tls_multi != NULL' is not that trivial. At first sight it seems to suggest 'we have multiple peers' (i.e. mode server), but it really does just mean 'this is a TLS mode connection' (ie, not a static key connection).
So even though I would have preferred this to be an inline function, I think it *does* add to readability. So I'd prefer to either keep it, or change it to a static inline function for type safety.
Quoted 63 lines
Remove it and use its expanded expression instead.
Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/forward.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/occ.c | 3 ++- src/openvpn/openvpn.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-)src/openvpn/forward.c +1
-1@@ -948,7 +948,7 @@ process_incoming_link_part2(struct context *c, struct link_socket_info *lsi, con* * Also, update the persisted version of our packet-id. */ -if (!TLS_MODE (c)) +if (!c->c2.tls_multi) {link_socket_set_outgoing_addr (&c->c2.buf, lsi, &c->c2.from,NULL , c->c2.es); }src/openvpn/init.c +1
-1@@ -1306,7 +1306,7 @@ do_init_timers(struct context *c, bool deferred)/* initialize occ timers */ if (c->options.occ - && !TLS_MODE (c) + && !c->c2.tls_multi && c->c2.options_string_local && c->c2.options_string_remote) {event_timeout_init (&c->c2.occ_interval,OCC_INTERVAL_SECONDS , now);src/openvpn/occ.c +2
-1@@ -378,7 +378,8 @@ process_received_occ_msg(struct context *c)case OCC_REPLY :dmsg (D_PACKET_CONTENT ,"RECEIVED OCC_REPLY" ); - if (c->options.occ && !TLS_MODE(c) && c->c2.options_string_remote) + if (c->options.occ && !c->c2.tls_multi + && c->c2.options_string_remote) { if (!options_cmp_equal_safe((char *) BPTR(&c->c2.buf), c->c2.options_string_remote,src/openvpn/openvpn.h +0
-1@@ -556,7 +556,6 @@ struct context* have been compiled in. */ -#define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \ PROTO_DUMP_FLAGS \
Re: [Openvpn-devel] [PATCH 7/7] Remove TLS_MODE
Quoted 13 lines · Steffan Karger
Hi,
Quoted 3 lines · Antonio Quartulli
Now that
ENABLE_CRYPTOhas been removed,TLS_MODEis basically a useless shortcut which does not really help the readability of the code.So I don't really agree here. As we've just experienced while discussing this on IRC, the meaning of '
c->c2.tls_multi!= NULL' is not that trivial. At first sight it seems to suggest 'we have multiple peers' (i.e. mode server), but it really does just mean 'this is a TLS mode connection' (ie, not a static key connection).
Quoted 3 lines
So even though I would have preferred this to be an inline function, I think it *does* add to readability. So I'd prefer to either keep it, or change it to a static inline function for type safety.
Let's drop this patch then.
With another patch we can convert all these macros to inline static functions.
Cheers,
Quoted 73 lines
Quoted 57 lines
Remove it and use its expanded expression instead.
Signed-off-by Antonio Quartulli <[email protected]...>--- src/openvpn/forward.c | 2 +- src/openvpn/init.c | 2 +- src/openvpn/occ.c | 3 ++- src/openvpn/openvpn.h | 1 - 4 files changed, 4 insertions(+), 4 deletions(-)src/openvpn/forward.c +1
-1@@ -948,7 +948,7 @@ process_incoming_link_part2(struct context *c, struct link_socket_info *lsi, con* * Also, update the persisted version of our packet-id. */ -if (!TLS_MODE (c)) +if (!c->c2.tls_multi) {link_socket_set_outgoing_addr (&c->c2.buf, lsi, &c->c2.from,NULL , c->c2.es); }src/openvpn/init.c +1
-1@@ -1306,7 +1306,7 @@ do_init_timers(struct context *c, bool deferred)/* initialize occ timers */ if (c->options.occ - && !TLS_MODE (c) + && !c->c2.tls_multi && c->c2.options_string_local && c->c2.options_string_remote) {event_timeout_init (&c->c2.occ_interval,OCC_INTERVAL_SECONDS , now);src/openvpn/occ.c +2
-1@@ -378,7 +378,8 @@ process_received_occ_msg(struct context *c)case OCC_REPLY :dmsg (D_PACKET_CONTENT ,"RECEIVED OCC_REPLY" ); - if (c->options.occ && !TLS_MODE(c) && c->c2.options_string_remote) + if (c->options.occ && !c->c2.tls_multi + && c->c2.options_string_remote) { if (!options_cmp_equal_safe((char *) BPTR(&c->c2.buf), c->c2.options_string_remote,src/openvpn/openvpn.h +0
-0src/openvpn/openvpn.h struct context · line 561
Quoted 7 lines
src/openvpn/openvpn.h +0
-1@@ -556,7 +556,6 @@ struct context* have been compiled in. */ -#define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \ PROTO_DUMP_FLAGS \------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Signature · 1 line
Antonio Quartulli
Hi,
Feature-ACK.
As discussed on IRC, let's apply this patch after 2/7 (or merge with 2/7) to prevent having a commit in the tree that unconditionally disabled crypto.
Quoted 73 lines · Antonio Quartulli
With this patch we remove the possibility to disable the crypto engine (
ENABLE_CRYPTOdefine) at configuration time.[Some unit-test are temporarily disabled and will be enabled again when
ENABLE_CRYPTOis completely removed from the codebase][--disable-crypto has been removed from .travis.yml too]
Signed-off-by Antonio Quartulli <[email protected]...>--- .travis.yml | 2 +- config-msvc.h | 1 - configure.ac | 33 ++++++---------------- doc/doxygen/openvpn.doxyfile.in | 2 +- .../keyingmaterialexporter.c | 2 -- sample/sample-plugins/log/log_v3.c | 2 -- tests/Makefile.am | 4 +-- tests/unit_tests/openvpn/Makefile.am | 4 +-- 8 files changed, 13 insertions(+), 37 deletions(-).travis.yml +1
-1@@ -59,7 +59,7 @@ matrix: - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-crypto" EXTRA_SCRIPT="make distcheck" + - env: SSLLIB="openssl" EXTRA_SCRIPT="make distcheck" os: linux compiler: clang - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo"config-msvc.h +0
-1@@ -4,7 +4,6 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO 1#define ENABLE_CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1configure.ac +1
-8@@ -77,13 +77,6 @@ AC_ARG_ENABLE(comp-stub, [enable_comp_stub="no"] ) -AC_ARG_ENABLE( - [crypto], - [AS_HELP_STRING([--disable-crypto], [disable crypto support @<:@default=yes@:>@])], - , - [enable_crypto="yes"] -) - AC_ARG_ENABLE( [ofb-cfb], [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],@@ -843,7 +836,7 @@ PKG_CHECK_MODULES( [] ) -if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then +if test "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])
configure.ac if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then · line 954
Quoted 6 lines
configure.ac +1
-2@@ -958,11 +951,10 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) + AC_DEFINE([CRYPTO_OPENSSL], [1], [Use OpenSSL library])
Why rename this (and ENABLE_CRYPTO_MBEDTLS)? All our configure feature flags currently have this ENABLE_ prefix, and I'd personally prefer to keep it for these too. (Though I don't care enough to NAK.)
Quoted 116 lines
configure.ac +7
-14CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then +elif test "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])@@ -1041,11 +1033,10 @@ elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; th CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) + AC_DEFINE([CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -elif test "${enable_crypto}" = "yes"; then +else AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi@@ -1245,14 +1236,10 @@ test "${enable_def_auth}" = "yes" && AC_DEFINE([ENABLE_DEF_AUTH], [1], [Enable d test "${enable_pf}" = "yes" && AC_DEFINE([ENABLE_PF], [1], [Enable internal packet filter]) test "${enable_strict_options}" = "yes" && AC_DEFINE([ENABLE_STRICT_OPTIONS_CHECK], [1], [Enable strict options check between peers]) -if test "${enable_crypto}" = "yes"; then - test "${have_crypto}" != "yes" && AC_MSG_ERROR([${with_crypto_library} crypto is required but missing]) - test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) - test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) - OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" - OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" - AC_DEFINE([ENABLE_CRYPTO], [1], [Enable crypto library]) -fi +test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) +test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) +OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" +OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" if test "${enable_plugins}" = "yes"; then OPTIONAL_DL_LIBS="${DL_LIBS}"@@ -1292,7 +1279,6 @@ fi if test "${enable_pkcs11}" = "yes"; then test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing]) - test "${enable_crypto}" != "yes" && AC_MSG_ERROR([PKCS11 can be enabled only if crypto is enabled]) OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}" OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}" AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])@@ -1372,7 +1358,6 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) -AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) AM_CONDITIONAL([HAVE_LD_WRAP_SUPPORT], [test "${have_ld_wrap_support}" = "yes"]) sampledir="\$(docdir)/sample"doc/doxygen/openvpn.doxyfile.in +1
-1@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +0
-2@@ -27,8 +27,6 @@* See the README file for build instructions. */ -#define ENABLE_CRYPTO -#include <stdio.h> #include <string.h> #include <stdlib.h> sample/sample-plugins/log/log_v3.c +0
-2@@ -35,8 +35,6 @@#include <string.h> #include <stdlib.h> -#define ENABLE_CRYPTO -#include "openvpn-plugin.h" /* tests/Makefile.am +1
-3@@ -15,9 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -if ENABLE_CRYPTO -test_scripts += t_lpback.sh t_cltsrv.sh -endif +#test_scripts += t_lpback.sh t_cltsrv.sh TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)tests/unit_tests/openvpn/Makefile.am +0
-0
tests/unit_tests/openvpn/Makefile.am if HAVE_LD_WRAP_SUPPORT · line 12
Quoted 10 lines
tests/unit_tests/openvpn/Makefile.am +1
-3@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO -check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif +#check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver TESTS = $(check_PROGRAMS)
-Steffan
Hi,
Quoted 7 lines · Steffan Karger
Hi,
Feature-ACK.
As discussed on IRC, let's apply this patch after 2/7 (or merge with 2/7) to prevent having a commit in the tree that unconditionally disabled crypto.
thanks for the review!
Quoted 78 lines · Antonio Quartulli
Quoted 76 lines
With this patch we remove the possibility to disable the crypto engine (
ENABLE_CRYPTOdefine) at configuration time.[Some unit-test are temporarily disabled and will be enabled again when
ENABLE_CRYPTOis completely removed from the codebase][--disable-crypto has been removed from .travis.yml too]
Signed-off-by Antonio Quartulli <[email protected]...>--- .travis.yml | 2 +- config-msvc.h | 1 - configure.ac | 33 ++++++---------------- doc/doxygen/openvpn.doxyfile.in | 2 +- .../keyingmaterialexporter.c | 2 -- sample/sample-plugins/log/log_v3.c | 2 -- tests/Makefile.am | 4 +-- tests/unit_tests/openvpn/Makefile.am | 4 +-- 8 files changed, 13 insertions(+), 37 deletions(-).travis.yml +1
-1@@ -59,7 +59,7 @@ matrix: - env: SSLLIB="openssl" CHOST=i686-w64-mingw32 os: linux compiler: ": Win32 build only" - - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-crypto" EXTRA_SCRIPT="make distcheck" + - env: SSLLIB="openssl" EXTRA_SCRIPT="make distcheck" os: linux compiler: clang - env: SSLLIB="openssl" EXTRA_CONFIG="--disable-lzo"config-msvc.h +0
-1@@ -4,7 +4,6 @@#define ENABLE_DEF_AUTH 1#define ENABLE_PF 1 -#define ENABLE_CRYPTO 1#define ENABLE_CRYPTO_OPENSSL 1#define ENABLE_DEBUG 1#define ENABLE_EUREPHIA 1configure.ac +1
-8@@ -77,13 +77,6 @@ AC_ARG_ENABLE(comp-stub, [enable_comp_stub="no"] ) -AC_ARG_ENABLE( - [crypto], - [AS_HELP_STRING([--disable-crypto], [disable crypto support @<:@default=yes@:>@])], - , - [enable_crypto="yes"] -) - AC_ARG_ENABLE( [ofb-cfb], [AS_HELP_STRING([--disable-ofb-cfb], [disable support for OFB and CFB cipher modes @<:@default=yes@:>@])],@@ -843,7 +836,7 @@ PKG_CHECK_MODULES( [] ) -if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then +if test "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])@@ -958,11 +951,10 @@ if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}"
Quoted 8 lines
configure.ac if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then · line 954
Quoted 3 lines
configure.ac +1
-2- have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) + AC_DEFINE([CRYPTO_OPENSSL], [1], [Use OpenSSL library])Why rename this (and
ENABLE_CRYPTO_MBEDTLS)? All our configure feature flags currently have thisENABLE_prefix, and I'd personally prefer to keep it for these too. (Though I don't care enough to NAK.)
I decided to remove the ENABLE_* bit because it felt to me like those ENABLE_CRYPTO_$SOMETHING were "subdefines" of ENABLE_CRYPTO.
However, for consistency with the rest I also agree that it would be better to keep the ENABLE_ prefix.
I'll send v2 of this patch only where I'll reintroduce the prefix.
Thanks!
Quoted 137 lines
Quoted 116 lines
configure.ac +7
-14CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then +elif test "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])@@ -1041,11 +1033,10 @@ elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; th CFLAGS="${saved_CFLAGS}" LIBS="${saved_LIBS}" - have_crypto="yes" - AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) + AC_DEFINE([CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -elif test "${enable_crypto}" = "yes"; then +else AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi@@ -1245,14 +1236,10 @@ test "${enable_def_auth}" = "yes" && AC_DEFINE([ENABLE_DEF_AUTH], [1], [Enable d test "${enable_pf}" = "yes" && AC_DEFINE([ENABLE_PF], [1], [Enable internal packet filter]) test "${enable_strict_options}" = "yes" && AC_DEFINE([ENABLE_STRICT_OPTIONS_CHECK], [1], [Enable strict options check between peers]) -if test "${enable_crypto}" = "yes"; then - test "${have_crypto}" != "yes" && AC_MSG_ERROR([${with_crypto_library} crypto is required but missing]) - test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) - test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) - OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" - OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" - AC_DEFINE([ENABLE_CRYPTO], [1], [Enable crypto library]) -fi +test "${enable_crypto_ofb_cfb}" = "yes" && AC_DEFINE([ENABLE_OFB_CFB_MODE], [1], [Enable OFB and CFB cipher modes]) +test "${have_crypto_aead_modes}" = "yes" && AC_DEFINE([HAVE_AEAD_CIPHER_MODES], [1], [Use crypto library]) +OPTIONAL_CRYPTO_CFLAGS="${OPTIONAL_CRYPTO_CFLAGS} ${CRYPTO_CFLAGS}" +OPTIONAL_CRYPTO_LIBS="${OPTIONAL_CRYPTO_LIBS} ${CRYPTO_LIBS}" if test "${enable_plugins}" = "yes"; then OPTIONAL_DL_LIBS="${DL_LIBS}"@@ -1292,7 +1279,6 @@ fi if test "${enable_pkcs11}" = "yes"; then test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing]) - test "${enable_crypto}" != "yes" && AC_MSG_ERROR([PKCS11 can be enabled only if crypto is enabled]) OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}" OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}" AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])@@ -1372,7 +1358,6 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) AM_CONDITIONAL([GIT_CHECKOUT], [test "${GIT_CHECKOUT}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_AUTH_PAM], [test "${enable_plugin_auth_pam}" = "yes"]) AM_CONDITIONAL([ENABLE_PLUGIN_DOWN_ROOT], [test "${enable_plugin_down_root}" = "yes"]) -AM_CONDITIONAL([ENABLE_CRYPTO], [test "${enable_crypto}" = "yes"]) AM_CONDITIONAL([HAVE_LD_WRAP_SUPPORT], [test "${have_ld_wrap_support}" = "yes"]) sampledir="\$(docdir)/sample"doc/doxygen/openvpn.doxyfile.in +1
-1@@ -235,7 +235,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY +PREDEFINED = _WIN32 NTLM USE_LZO ENABLE_FRAGMENT P2MP P2MP_SERVER ENABLE_CRYPTO_OPENSSL ENABLE_PLUGIN ENABLE_MANAGEMENT ENABLE_OCC HAVE_GETTIMEOFDAY EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #---------------------------------------------------------------------------sample/sample-plugins/keying-material-exporter-demo/keyingmaterialexporter.c +0
-2@@ -27,8 +27,6 @@* See the README file for build instructions. */ -#define ENABLE_CRYPTO -#include <stdio.h> #include <string.h> #include <stdlib.h> sample/sample-plugins/log/log_v3.c +0
-2@@ -35,8 +35,6 @@#include <string.h> #include <stdlib.h> -#define ENABLE_CRYPTO -#include "openvpn-plugin.h" /* tests/Makefile.am +1
-3@@ -15,9 +15,7 @@ MAINTAINERCLEANFILES = \ SUBDIRS = unit_tests test_scripts = t_client.sh -if ENABLE_CRYPTO -test_scripts += t_lpback.sh t_cltsrv.sh -endif +#test_scripts += t_lpback.sh t_cltsrv.sh TESTS_ENVIRONMENT = top_srcdir="$(top_srcdir)" TESTS = $(test_scripts)tests/unit_tests/openvpn/Makefile.am +0
-0tests/unit_tests/openvpn/Makefile.am if HAVE_LD_WRAP_SUPPORT · line 12
Quoted 10 lines
tests/unit_tests/openvpn/Makefile.am +1
-3@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO -check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif +#check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver TESTS = $(check_PROGRAMS)-Steffan
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Signature · 1 line
Antonio Quartulli
PATCH v2 1/7 Remove ENABLE_CRYPTO
In reply to Antonio QuartulliThe crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
[re-enable unit-tests that were previously disabled]
Signed-off-by Antonio Quartulli <[email protected]...>
---
v2:
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL
- move to first patch in the set to avoid having a point in the tree where encryption is disabled
doc/doxygen/doc_data_crypto.h | 12 +++--- include/openvpn-plugin.h.in | 11 +----- src/openvpn/crypto.c | 4 -- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_mbedtls.h | 6 +-- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/crypto_openssl.h | 6 +-- src/openvpn/forward-inline.h | 6 --- src/openvpn/forward.c | 15 -------- src/openvpn/init.c | 64 ++----------------------------- src/openvpn/manage.c | 5 +-- src/openvpn/misc.c | 13 ------- src/openvpn/misc.h | 7 +--- src/openvpn/openvpn.h | 24 ------------ src/openvpn/options.c | 55 +++----------------------- src/openvpn/options.h | 9 +---- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 -- src/openvpn/plugin.c | 23 +++-------- src/openvpn/plugin.h | 18 +++------ src/openvpn/reliable.c | 9 ----- src/openvpn/reliable.h | 3 -- src/openvpn/session_id.c | 9 ----- src/openvpn/session_id.h | 3 -- src/openvpn/ssl.c | 9 ----- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 3 -- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 4 +- src/openvpn/ssl_verify.c | 4 -- src/openvpn/ssl_verify.h | 4 -- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 16 ++------ src/openvpn/tls_crypt.c | 3 -- src/openvpn/tls_crypt.h | 4 -- tests/unit_tests/openvpn/Makefile.am | 2 - tests/unit_tests/openvpn/test_tls_crypt.c | 4 -- 39 files changed, 50 insertions(+), 340 deletions(-)
doc/doxygen/doc_data_crypto.h +5 -7
@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external
include/openvpn-plugin.h.in +2 -9
@@ -26,7 +26,6 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO #ifdef ENABLE_CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED
@@ -40,7 +39,6 @@ typedef mbedtls_x509_crt openvpn_x509_cert_t; typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>
@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in
@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };
src/openvpn/crypto.c +0 -4
@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h"
@@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */
src/openvpn/crypto.h +0 -4
@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h"
@@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */
src/openvpn/crypto_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h"
@@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* ENABLE_CRYPTO_MBEDTLS */
src/openvpn/crypto_mbedtls.h +3 -3
@@ -26,8 +26,8 @@* @file Data Channel Cryptography mbed TLS-specific backend interface */ -#ifndef CRYPTO_MBEDTLS_H_ -#define CRYPTO_MBEDTLS_H_ +#ifndef ENABLE_CRYPTO_MBEDTLS_H_ +#define ENABLE_CRYPTO_MBEDTLS_H_ #include <mbedtls/cipher.h> #include <mbedtls/md.h>
@@ -147,4 +147,4 @@ mbed_log_func_line_lite(unsigned int flags, int errval, mbed_log_func_line_lite(D_CRYPT_ERRORS, errval, __func__, __LINE__) -#endif /* CRYPTO_MBEDTLS_H_ */ +#endif /* ENABLE_CRYPTO_MBEDTLS_H_ */
src/openvpn/crypto_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h"
@@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* ENABLE_CRYPTO_OPENSSL */
src/openvpn/crypto_openssl.h +3 -3
@@ -26,8 +26,8 @@* @file Data Channel Cryptography OpenSSL-specific backend interface */ -#ifndef CRYPTO_OPENSSL_H_ -#define CRYPTO_OPENSSL_H_ +#ifndef ENABLE_CRYPTO_OPENSSL_H_ +#define ENABLE_CRYPTO_OPENSSL_H_ #include <openssl/evp.h> #include <openssl/hmac.h>
@@ -102,4 +102,4 @@ void crypto_print_openssl_errors(const unsigned int flags); } while (false) -#endif /* CRYPTO_OPENSSL_H_ */ +#endif /* ENABLE_CRYPTO_OPENSSL_H_ */
src/openvpn/forward-inline.h +0 -6
@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/*
@@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);
@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/*
@@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */
@@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled
src/openvpn/forward.c +0 -15
@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {
@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP
@@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();
@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }
@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));
@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to.
@@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);
@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/*
@@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {
@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )
@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {
src/openvpn/init.c +3 -61
347 lines not on this page · raw message
src/openvpn/manage.c +1 -4
@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void
@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );
src/openvpn/misc.c +0 -13
@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov.
@@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */
src/openvpn/misc.h +1 -6
@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);
@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/*
src/openvpn/openvpn.h +0 -24
@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;
@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/*
@@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP
@@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */
@@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the
@@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \
@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
src/openvpn/options.c +5 -50
243 lines not on this page · raw message
src/openvpn/options.h +1 -8
@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /*
@@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif
@@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;
@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;
@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;
@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */
src/openvpn/packet_id.c +0 -4
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h"
@@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */
src/openvpn/packet_id.h +0 -3
@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H
@@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/plugin.c +6 -17
@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;
@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;
@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)
@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {
src/openvpn/plugin.h +5 -13
@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);
@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;
@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */
src/openvpn/reliable.c +0 -9
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h"
@@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/reliable.h +0 -3
@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H
@@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.c +0 -9
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h"
@@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.h +0 -3
@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H
@@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.c +0 -9
@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h"
@@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.h +0 -4
@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h"
@@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */
src/openvpn/ssl_backend.h +0 -3
@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. *
@@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */
src/openvpn/ssl_mbedtls.c +2 -2
@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h"
@@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */
src/openvpn/ssl_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h"
@@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */
src/openvpn/ssl_verify.c +0 -4
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h"
@@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl_verify.h +0 -4
@@ -29,8 +29,6 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h"
@@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */
src/openvpn/ssl_verify_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h"
@@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(ENABLE_CRYPTO_MBEDTLS) */
src/openvpn/ssl_verify_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "ssl_verify_openssl.h"
@@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */
src/openvpn/syshead.h +3 -13
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0
@@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif
@@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif
@@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support
src/openvpn/tls_crypt.c +0 -3
@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h"
@@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */
src/openvpn/tls_crypt.h +0 -4
@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h"
@@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */
tests/unit_tests/openvpn/Makefile.am +0 -2
@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif TESTS = $(check_PROGRAMS)
tests/unit_tests/openvpn/test_tls_crypt.c +0 -4
@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h>
@@ -268,5 +266,3 @@ main(void) {return ret; } - -#endif /* ENABLE_CRYPTO */
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH v2 1/7] Remove ENABLE_CRYPTO
Hi,
Thanks for v2. Some things went wrong with the s/CRYPTO_/ENABLE_CRYPTO/ though:
Quoted 190 lines · Antonio Quartulli
The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
[re-enable unit-tests that were previously disabled]
Signed-off-by Antonio Quartulli <[email protected]...>---
v2:
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL
- move to first patch in the set to avoid having a point in the tree where encryption is disableddoc/doxygen/doc_data_crypto.h | 12 +++--- include/openvpn-plugin.h.in | 11 +----- src/openvpn/crypto.c | 4 -- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_mbedtls.h | 6 +-- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/crypto_openssl.h | 6 +-- src/openvpn/forward-inline.h | 6 --- src/openvpn/forward.c | 15 -------- src/openvpn/init.c | 64 ++----------------------------- src/openvpn/manage.c | 5 +-- src/openvpn/misc.c | 13 ------- src/openvpn/misc.h | 7 +--- src/openvpn/openvpn.h | 24 ------------ src/openvpn/options.c | 55 +++----------------------- src/openvpn/options.h | 9 +---- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 -- src/openvpn/plugin.c | 23 +++-------- src/openvpn/plugin.h | 18 +++------ src/openvpn/reliable.c | 9 ----- src/openvpn/reliable.h | 3 -- src/openvpn/session_id.c | 9 ----- src/openvpn/session_id.h | 3 -- src/openvpn/ssl.c | 9 ----- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 3 -- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 4 +- src/openvpn/ssl_verify.c | 4 -- src/openvpn/ssl_verify.h | 4 -- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 16 ++------ src/openvpn/tls_crypt.c | 3 -- src/openvpn/tls_crypt.h | 4 -- tests/unit_tests/openvpn/Makefile.am | 2 - tests/unit_tests/openvpn/test_tls_crypt.c | 4 -- 39 files changed, 50 insertions(+), 340 deletions(-)doc/doxygen/doc_data_crypto.h +5
-7@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external include/openvpn-plugin.h.in +2
-9@@ -26,7 +26,6 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO #ifdef ENABLE_CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED@@ -40,7 +39,6 @@ typedef mbedtls_x509_crt openvpn_x509_cert_t; typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };src/openvpn/crypto.c +0
-4@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h" @@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */ src/openvpn/crypto.h +0
-4@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h" @@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */ src/openvpn/crypto_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h" @@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* ENABLE_CRYPTO_MBEDTLS */ src/openvpn/crypto_mbedtls.h +0
-0
src/openvpn/crypto_mbedtls.h line 30
Quoted 7 lines
src/openvpn/crypto_mbedtls.h +2
-2@@ -26,8 +26,8 @@* @file Data Channel Cryptography mbed TLS-specific backend interface */ -#ifndef CRYPTO_MBEDTLS_H_ -#define CRYPTO_MBEDTLS_H_ +#ifndef ENABLE_CRYPTO_MBEDTLS_H_ +#define ENABLE_CRYPTO_MBEDTLS_H_
I think these are changed accidentally?
src/openvpn/crypto_mbedtls.h mbed_log_func_line_lite(unsigned int flags, int errval, · line 150
Quoted 8 lines
src/openvpn/crypto_mbedtls.h +1
-1#include <mbedtls/cipher.h> #include <mbedtls/md.h> @@ -147,4 +147,4 @@ mbed_log_func_line_lite(unsigned int flags, int errval, mbed_log_func_line_lite(D_CRYPT_ERRORS, errval, __func__, __LINE__) -#endif /* CRYPTO_MBEDTLS_H_ */ +#endif /* ENABLE_CRYPTO_MBEDTLS_H_ */
As above.
Quoted 24 lines
src/openvpn/crypto_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h" @@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* ENABLE_CRYPTO_OPENSSL */ src/openvpn/crypto_openssl.h +0
-0
src/openvpn/crypto_openssl.h line 30
Quoted 7 lines
src/openvpn/crypto_openssl.h +2
-2@@ -26,8 +26,8 @@* @file Data Channel Cryptography OpenSSL-specific backend interface */ -#ifndef CRYPTO_OPENSSL_H_ -#define CRYPTO_OPENSSL_H_ +#ifndef ENABLE_CRYPTO_OPENSSL_H_ +#define ENABLE_CRYPTO_OPENSSL_H_
Same here,
src/openvpn/crypto_openssl.h void crypto_print_openssl_errors(const unsigned int flags); · line 105
Quoted 8 lines
src/openvpn/crypto_openssl.h +1
-1#include <openssl/evp.h> #include <openssl/hmac.h> @@ -102,4 +102,4 @@ void crypto_print_openssl_errors(const unsigned int flags); } while (false) -#endif /* CRYPTO_OPENSSL_H_ */ +#endif /* ENABLE_CRYPTO_OPENSSL_H_ */
and here.
Quoted 1,570 lines
src/openvpn/forward-inline.h +0
-6@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/* @@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/* @@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */ @@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled src/openvpn/forward.c +0
-15@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP @@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to. @@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/* @@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {src/openvpn/init.c +3
-61@@ -529,13 +529,11 @@ next_connection_entry(struct context *c)void init_query_passwords (const struct context *c) { -#ifdef ENABLE_CRYPTO /* Certificate password input */ if (c->options.key_pass_file) {pem_password_setup (c->options.key_pass_file); } -#endif #if P2MP /* Auth user/pass input */ @@ -704,7 +702,7 @@ init_static(void) {/* configure_path (); */ -#if defined(ENABLE_CRYPTO ) && defined(DMALLOC ) +#if defined(DMALLOC )crypto_init_dmalloc ();#endif @@ -741,14 +739,12 @@ init_static(void)update_time (); -#ifdef ENABLE_CRYPTO init_ssl_lib ();/* init PRNG used for IV generation */ /* When forking, copy this to more places in the code to avoid fork * random-state predictability */ prng_init (NULL ,0 ); -#endif #ifdef PID_TEST packet_id_interactive_test ();/* test the sequence number code */ @@ -942,9 +938,7 @@ init_static(void)void uninit_static (void ) { -#ifdef ENABLE_CRYPTO free_ssl_lib (); -#endif #ifdef ENABLE_PKCS11 pkcs11_terminate ();@@ -954,7 +948,7 @@ uninit_static(void)close_port_share ();#endif -#if defined(MEASURE_TLS_HANDSHAKE_STATS ) && defined(ENABLE_CRYPTO ) +#if defined(MEASURE_TLS_HANDSHAKE_STATS )show_tls_performance_stats ();#endif }@@ -998,7 +992,6 @@ print_openssl_info(const struct options *options)/* * OpenSSL info print mode? */ -#ifdef ENABLE_CRYPTO if (options->show_ciphers || options->show_digests || options->show_engines || options->show_tls_ciphers || options->show_curves) {@@ -1025,7 +1018,6 @@ print_openssl_info(const struct options *options) }return true; } -#endif /* ifdef ENABLE_CRYPTO */ return false; }@@ -1035,7 +1027,6 @@ print_openssl_info(const struct options *options)bool do_genkey (const struct options *options) { -#ifdef ENABLE_CRYPTO if (options->genkey) {int nbits_written;@@ -1055,7 +1046,6 @@ do_genkey(const struct options *options) options->shared_secret_file);return true; } -#endif return false; }@@ -1071,10 +1061,8 @@ do_persist_tuntap(const struct options *options)notnull (options->dev,"TUN/TAP device (--dev)" );if (options->ce.remote || options->ifconfig_local || options->ifconfig_remote_netmask -#ifdef ENABLE_CRYPTO || options->shared_secret_file || options->tls_server || options->tls_client -#endif ) { msg(M_FATAL|M_OPTERR,@@ -1226,12 +1214,10 @@ const char * format_common_name(struct context *c, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {buf_printf (&out,"[%s] " ,tls_common_name (c->c2.tls_multi, false)); } -#endif return BSTR (&out); }@@ -1333,7 +1319,6 @@ do_init_timers(struct context *c, bool deferred)#endif /* initialize packet_id persistence timer */ -#ifdef ENABLE_CRYPTO if (c->options.packet_id_file) {event_timeout_init (&c->c2.packet_id_persist_interval,60 , now);@@ -1342,7 +1327,6 @@ do_init_timers(struct context *c, bool deferred)/* initialize tmp_int optimization that limits the number of times we call * tls_multi_process in the main event loop */ interval_init (&c->c2.tmp_int,TLS_MULTI_HORIZON ,TLS_MULTI_REFRESH ); -#endif } }@@ -1485,7 +1469,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags)do_uid_gid_chroot (c, true); -#ifdef ENABLE_CRYPTO /* * In some cases (i.e. when receiving auth-token via * push-reply) the auth-nocache option configured on the @@ -1497,7 +1480,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags) {delayed_auth_pass_purge (); } -#endif /* ENABLE_CRYPTO */ /* Test if errors */ if (flags &ISC_ERRORS )@@ -2136,12 +2118,10 @@ pull_permission_mask(const struct context *c) flags |= (OPT_P_ROUTE |OPT_P_IPWIN32 ); } -#ifdef ENABLE_CRYPTO if (c->options.ncp_enabled) { flags |=OPT_P_NCP ; } -#endif return flags; }@@ -2230,7 +2210,6 @@ do_deferred_options(struct context *c, const unsigned int found)msg (D_PUSH ,"OPTIONS IMPORT: environment modified" ); } -#ifdef ENABLE_CRYPTO if (found &OPT_P_PEER_ID ) {msg (D_PUSH ,"OPTIONS IMPORT: peer-id set" );@@ -2271,7 +2250,7 @@ do_deferred_options(struct context *c, const unsigned int found)return false; } } -#endif /* ifdef ENABLE_CRYPTO */ +return true; }@@ -2423,19 +2402,15 @@ frame_finalize_options(struct context *c, const struct options *o)static void key_schedule_free (struct key_schedule *ks,bool free_ssl_ctx) { -#ifdef ENABLE_CRYPTO free_key_ctx_bi (&ks->static_key);if (tls_ctx_initialised (&ks->ssl_ctx) && free_ssl_ctx) {tls_ctx_free (&ks->ssl_ctx);free_key_ctx_bi (&ks->tls_wrap_key); } -#endif /* ENABLE_CRYPTO */ CLEAR (*ks); } -#ifdef ENABLE_CRYPTO -static void init_crypto_pre (struct context *c,const unsigned int flags) {@@ -2880,12 +2855,10 @@ do_init_crypto_none(const struct context *c)"protected against man-in-the-middle changes. " "PLEASE DO RECONSIDER THIS CONFIGURATION!"); } -#endif /* ifdef ENABLE_CRYPTO */ static void do_init_crypto (struct context *c,const unsigned int flags) { -#ifdef ENABLE_CRYPTO if (c->options.shared_secret_file) {do_init_crypto_static (c, flags);@@ -2898,11 +2871,6 @@ do_init_crypto(struct context *c, const unsigned int flags) {do_init_crypto_none (c); } -#else /* ENABLE_CRYPTO */ -msg (M_WARN , -"******* WARNING *******: " PACKAGE_NAME -" built without crypto library -- encryption and authentication features disabled -- all data will be tunnelled as cleartext" ); -#endif /* ENABLE_CRYPTO */ } static void@@ -3101,7 +3069,6 @@ do_option_warnings(struct context *c)#endif /* if P2MP_SERVER */ #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO if (!o->replay) {msg (M_WARN ,"WARNING: You have disabled Replay Protection (--no-replay) which may make " PACKAGE_NAME " less secure" );@@ -3123,7 +3090,6 @@ do_option_warnings(struct context *c) {msg (M_WARN ,"WARNING: --ns-cert-type is DEPRECATED. Use --remote-cert-tls instead." ); } -#endif /* ifdef ENABLE_CRYPTO */ /* If a script is used, print appropiate warnings */ if (o->user_script_used)@@ -3146,9 +3112,7 @@ do_option_warnings(struct context *c)static void do_init_frame_tls (struct context *c) { -#ifdef ENABLE_CRYPTO do_init_finalize_tls_frame (c); -#endif } struct context_buffers *@@ -3163,10 +3127,8 @@ init_context_buffers(const struct frame *frame) b->aux_buf =alloc_buf (BUF_SIZE (frame)); -#ifdef ENABLE_CRYPTO b->encrypt_buf =alloc_buf (BUF_SIZE (frame)); b->decrypt_buf =alloc_buf (BUF_SIZE (frame)); -#endif #ifdef USE_COMP b->compress_buf =alloc_buf (BUF_SIZE (frame));@@ -3190,10 +3152,8 @@ free_context_buffers(struct context_buffers *b)free_buf (&b->decompress_buf);#endif -#ifdef ENABLE_CRYPTO free_buf (&b->encrypt_buf);free_buf (&b->decrypt_buf); -#endif free (b); }@@ -3329,14 +3289,12 @@ do_compute_occ_strings(struct context *c)options_string_version (c->c2.options_string_remote, &gc), c->c2.options_string_remote); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_init_set_options (c->c2.tls_multi, c->c2.options_string_local, c->c2.options_string_remote); } -#endif gc_free (&gc); }@@ -3410,7 +3368,6 @@ do_close_free_buf(struct context *c)static void do_close_tls (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_free (c->c2.tls_multi, true);@@ -3429,7 +3386,6 @@ do_close_tls(struct context *c) } c->c2.options_string_local = c->c2.options_string_remote =NULL ;#endif -#endif }/* @@ -3494,14 +3450,12 @@ do_close_link_socket(struct context *c)static void do_close_packet_id (struct context *c) { -#ifdef ENABLE_CRYPTO packet_id_free (&c->c2.crypto_options.packet_id);packet_id_persist_save (&c->c1.pid_persist);if (!(c->sig->signal_received ==SIGUSR1 )) {packet_id_persist_close (&c->c1.pid_persist); } -#endif }#ifdef ENABLE_FRAGMENT @@ -3680,7 +3634,6 @@ do_setup_fast_io(struct context *c)static void do_signal_on_tls_errors (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->options.tls_exit) { c->c2.tls_exit_signal =SIGTERM ;@@ -3689,7 +3642,6 @@ do_signal_on_tls_errors(struct context *c) { c->c2.tls_exit_signal =SIGUSR1 ; } -#endif }#ifdef ENABLE_PLUGIN @@ -4369,7 +4321,6 @@ inherit_context_child(struct context *dest,/* c1 init */ packet_id_persist_init (&dest->c1.pid_persist); -#ifdef ENABLE_CRYPTO dest->c1.ks.key_type = src->c1.ks.key_type;/* inherit SSL context */ dest->c1.ks.ssl_ctx = src->c1.ks.ssl_ctx;@@ -4379,7 +4330,6 @@ inherit_context_child(struct context *dest, dest->c1.ciphername = src->c1.ciphername; dest->c1.authname = src->c1.authname; dest->c1.keysize = src->c1.keysize; -#endif /* options */ dest->options = src->options;@@ -4453,9 +4403,7 @@ inherit_context_top(struct context *dest,/* detach plugins */ dest->plugins_owned = false; -#ifdef ENABLE_CRYPTO dest->c2.tls_multi =NULL ; -#endif /* detach c1 ownership */ dest->c1.tuntap_owned = false;@@ -4513,8 +4461,6 @@ close_context(struct context *c, int sig, unsigned int flags) } } -#ifdef ENABLE_CRYPTO -/* * Do a loopback test * on the crypto subsystem. @@ -4542,12 +4488,9 @@ test_crypto_thread(void *arg)return NULL ; } -#endif /* ENABLE_CRYPTO */ -bool do_test_crypto (const struct options *o) { -#ifdef ENABLE_CRYPTO if (o->test_crypto) {struct context c;@@ -4562,6 +4505,5 @@ do_test_crypto(const struct options *o)test_crypto_thread ((void *) &c);return true; } -#endif return false; }src/openvpn/manage.c +1
-4@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );src/openvpn/misc.c +0
-13@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov. @@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */ src/openvpn/misc.h +1
-6@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/* src/openvpn/openvpn.h +0
-24@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/* @@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP @@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */ @@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the @@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFFsrc/openvpn/options.c +5
-50@@ -67,7 +67,6 @@ const char title_string[] = " [git:" CONFIGURE_GIT_REVISION CONFIGURE_GIT_FLAGS "]"#endif " " TARGET_ALIAS -#ifdef ENABLE_CRYPTO #if defined(ENABLE_CRYPTO_MBEDTLS ) " [SSL (mbed TLS)]"#elif defined(ENABLE_CRYPTO_OPENSSL )@@ -75,7 +74,6 @@ const char title_string[] =#else " [SSL]"#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ -#endif /* ENABLE_CRYPTO */ #ifdef USE_COMP #ifdef ENABLE_LZO " [LZO]" @@ -518,7 +516,6 @@ static const char usage_message[] ="--explicit-exit-notify [n] : On exit/restart, send exit signal to\n" " server/remote. n = # of retries, default=1.\n"#endif -#ifdef ENABLE_CRYPTO "\n" "Data Channel Encryption Options (must be compatible between peers):\n" "(These options are meaningful for both Static Key & TLS-mode)\n" @@ -748,7 +745,6 @@ static const char usage_message[] ="--genkey : Generate a random key to be used as a shared secret,\n" " for use with the --secret option.\n" "--secret file : Write key to file.\n" -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_FEATURE_TUN_PERSIST"\n" "Tun/tap config mode (available with linux 2.4+):\n" @@ -852,7 +848,6 @@ init_options(struct options *o, const bool init_gc)#if P2MP o->scheduled_exit_interval =5 ;#endif -#ifdef ENABLE_CRYPTO o->ciphername ="BF-CBC" ;#ifdef HAVE_AEAD_CIPHER_MODES /* IV_NCP=2 requires GCM support */ o->ncp_enabled = true;@@ -882,7 +877,6 @@ init_options(struct options *o, const bool init_gc)#ifdef ENABLE_X509ALTUSERNAME o->x509_username_field =X509_USERNAME_FIELD_DEFAULT ;#endif -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 o->pkcs11_pin_cache_period =-1 ;#endif /* ENABLE_PKCS11 */ @@ -1146,7 +1140,6 @@ string_substitute(const char *src, int from, int to, struct gc_arena *gc)return ret; } -#ifdef ENABLE_CRYPTO static uint8_t *parse_hash_fingerprint (const char *str,int nbytes,int msglevel,struct gc_arena *gc) {@@ -1188,7 +1181,6 @@ parse_hash_fingerprint(const char *str, int nbytes, int msglevel, struct gc_aren }return ret; } -#endif /* ifdef ENABLE_CRYPTO */ #ifdef _WIN32@@ -1560,14 +1552,12 @@ show_settings(const struct options *o)SHOW_INT (persist_mode);#endif -#ifdef ENABLE_CRYPTO SHOW_BOOL (show_ciphers);SHOW_BOOL (show_digests);SHOW_BOOL (show_engines);SHOW_BOOL (genkey);SHOW_STR (key_pass_file);SHOW_BOOL (show_tls_ciphers); -#endif SHOW_INT (connect_retry_max);show_connection_entries (o);@@ -1702,7 +1692,6 @@ show_settings(const struct options *o) }#endif -#ifdef ENABLE_CRYPTO SHOW_STR (shared_secret_file);SHOW_INT (key_direction);SHOW_STR (ciphername);@@ -1790,7 +1779,6 @@ show_settings(const struct options *o)SHOW_STR (tls_auth_file);SHOW_STR (tls_crypt_file); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 {@@ -2024,14 +2012,14 @@ options_postprocess_verify_ce(const struct options *options, const struct connecinit_options (&defaults, true); -#ifdef ENABLE_CRYPTO if (options->test_crypto) {notnull (options->shared_secret_file,"key file (--secret)" ); }else -#endif -notnull (options->dev,"TUN/TAP device (--dev)" ); + { +notnull (options->dev,"TUN/TAP device (--dev)" ); + }/* * Get tun/tap/null device type @@ -2072,10 +2060,7 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }if (options->inetd ==INETD_NOWAIT -#ifdef ENABLE_CRYPTO - && !(options->tls_server || options->tls_client) -#endif - ) + && !(options->tls_server || options->tls_client)) {msg (M_USAGE ,"--inetd nowait can only be used in TLS mode" ); }@@ -2485,8 +2470,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }#endif /* P2MP_SERVER */ -#ifdef ENABLE_CRYPTO -if (options->ncp_enabled && !tls_check_ncp_cipher_list (options->ncp_ciphers)) {msg (M_USAGE ,"NCP cipher list contains unsupported ciphers." );@@ -2771,7 +2754,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec } }#undef MUST_BE_UNDEF -#endif /* ENABLE_CRYPTO */ #if P2MP if (options->auth_user_pass_file && !options->pull)@@ -3009,7 +2991,6 @@ options_postprocess_mutate(struct options *o)options_postprocess_mutate_ce (o, o->connection_list->array[i]); } -#ifdef ENABLE_CRYPTO if (o->tls_server) {/* Check that DH file is specified, or explicitly disabled */ @@ -3035,7 +3016,6 @@ options_postprocess_mutate(struct options *o) "in P2MP client or server mode" ); o->ncp_enabled = false; } -#endif #if ENABLE_MANAGEMENT if (o->http_proxy_override)@@ -3267,7 +3247,6 @@ options_postprocess_filechecks(struct options *options) {bool errs = false; -#ifdef ENABLE_CRYPTO /* ** SSL/TLS/crypto related files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" );@@ -3308,7 +3287,6 @@ options_postprocess_filechecks(struct options *options)/* ** Password files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_ACPTSTDIN |CHKACC_PRIVATE , options->key_pass_file,R_OK ,"--askpass" ); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_MANAGEMENT errs |= check_file_access(CHKACC_FILE|CHKACC_ACPTSTDIN|CHKACC_PRIVATE, options->management_user_pass, R_OK,@@ -3331,10 +3309,8 @@ options_postprocess_filechecks(struct options *options) R_OK|W_OK, "--status");/* ** Config related ** */ -#ifdef ENABLE_CRYPTO errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" ); -#endif /* ENABLE_CRYPTO */ #if P2MP_SERVER errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" );@@ -3462,7 +3438,7 @@ static size_t calc_options_string_link_mtu(const struct options *o, const struct frame *frame) { size_t link_mtu = EXPANDED_SIZE(frame); -#ifdef ENABLE_CRYPTO +if (o->pull || o->mode ==MODE_SERVER ) {struct frame fake_frame = *frame;@@ -3478,7 +3454,6 @@ calc_options_string_link_mtu(const struct options *o, const struct frame *frame) EXPANDED_SIZE(&fake_frame)); link_mtu =EXPANDED_SIZE (&fake_frame); } -#endif return link_mtu; }@@ -3606,8 +3581,6 @@ options_string(const struct options *o, }#endif -#ifdef ENABLE_CRYPTO -#define TLS_CLIENT (o->tls_client)#define TLS_SERVER (o->tls_server)@@ -3705,8 +3678,6 @@ options_string(const struct options *o,#undef TLS_CLIENT#undef TLS_SERVER -#endif /* ENABLE_CRYPTO */ -return BSTR (&out); }@@ -4084,7 +4055,6 @@ usage(void)struct options o;init_options (&o, true); -#ifdef ENABLE_CRYPTO fprintf(fp, usage_message, title_string, o.ce.connect_retry_seconds,@@ -4096,15 +4066,6 @@ usage(void) o.replay_window, o.replay_time, o.tls_timeout, o.renegotiate_seconds, o.handshake_window, o.transition_window); -#else /* ifdef ENABLE_CRYPTO */ -fprintf (fp, usage_message, - title_string, - o.ce.connect_retry_seconds, - o.ce.connect_retry_seconds_max, - o.ce.local_port, o.ce.remote_port, -TUN_MTU_DEFAULT ,TAP_MTU_EXTRA_DEFAULT , - o.verbosity); -#endif fflush (fp);#endif /* ENABLE_SMALL */ @@ -4132,11 +4093,7 @@ show_windows_version(const unsigned int flags)void show_library_versions (const unsigned int flags) { -#ifdef ENABLE_CRYPTO #define SSL_LIB_VER_STR get_ssl_library_version() -#else -#define SSL_LIB_VER_STR "" -#endif #ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string()#else @@ -7441,7 +7398,6 @@ add_option(struct options *options, } }#endif /* USE_COMP */ -#ifdef ENABLE_CRYPTO else if (streq(p[0], "show-ciphers") && !p[1]) {VERIFY_PERMISSION (OPT_P_GENERAL );@@ -8124,7 +8080,6 @@ add_option(struct options *options, options->x509_username_field = p[1 ]; }#endif /* ENABLE_X509ALTUSERNAME */ -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 else if (streq(p[0], "show-pkcs11-ids") && !p[3]) {src/openvpn/options.h +1
-8@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /* @@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif @@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */ src/openvpn/packet_id.c +0
-4@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h" @@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */ src/openvpn/packet_id.h +0
-3@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H @@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/plugin.c +6
-17@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {src/openvpn/plugin.h +5
-13@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */ src/openvpn/reliable.c +0
-9@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h" @@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/reliable.h +0
-3@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H @@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.c +0
-9@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h" @@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.h +0
-3@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H @@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.c +0
-9@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h" @@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.h +0
-4@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h" @@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */ src/openvpn/ssl_backend.h +0
-3@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. * @@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */ src/openvpn/ssl_mbedtls.c +2
-2@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h" @@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h" @@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/ssl_verify.c +0
-4@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h" @@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl_verify.h +0
-4@@ -29,8 +29,6 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h" @@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */ src/openvpn/ssl_verify_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h" @@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_verify_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "ssl_verify_openssl.h" @@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/syshead.h +3
-13@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0@@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif @@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif @@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support src/openvpn/tls_crypt.c +0
-3@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h" @@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */ src/openvpn/tls_crypt.h +0
-4@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h" @@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */ tests/unit_tests/openvpn/Makefile.am +0
-2@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif TESTS = $(check_PROGRAMS)tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h>
tests/unit_tests/openvpn/test_tls_crypt.c main(void) { · line 272
Quoted 5 lines
tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -268,5 +266,3 @@ main(void) {return ret; } - -#endif /* ENABLE_CRYPTO */
Otherwise this looks good. So, provided that the above accidental changes are removed:
-Steffan
Re: [Openvpn-devel] [PATCH v2 1/7] Remove ENABLE_CRYPTO
Hi,
Quoted 199 lines · Steffan Karger
Hi,
Thanks for v2. Some things went wrong with the s/CRYPTO_/ENABLE_CRYPTO/ though:
Quoted 193 lines · Antonio Quartulli
The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
[re-enable unit-tests that were previously disabled]
Signed-off-by Antonio Quartulli <[email protected]...>---
v2:
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL
- move to first patch in the set to avoid having a point in the tree where encryption is disableddoc/doxygen/doc_data_crypto.h | 12 +++--- include/openvpn-plugin.h.in | 11 +----- src/openvpn/crypto.c | 4 -- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_mbedtls.h | 6 +-- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/crypto_openssl.h | 6 +-- src/openvpn/forward-inline.h | 6 --- src/openvpn/forward.c | 15 -------- src/openvpn/init.c | 64 ++----------------------------- src/openvpn/manage.c | 5 +-- src/openvpn/misc.c | 13 ------- src/openvpn/misc.h | 7 +--- src/openvpn/openvpn.h | 24 ------------ src/openvpn/options.c | 55 +++----------------------- src/openvpn/options.h | 9 +---- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 -- src/openvpn/plugin.c | 23 +++-------- src/openvpn/plugin.h | 18 +++------ src/openvpn/reliable.c | 9 ----- src/openvpn/reliable.h | 3 -- src/openvpn/session_id.c | 9 ----- src/openvpn/session_id.h | 3 -- src/openvpn/ssl.c | 9 ----- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 3 -- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 4 +- src/openvpn/ssl_verify.c | 4 -- src/openvpn/ssl_verify.h | 4 -- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 16 ++------ src/openvpn/tls_crypt.c | 3 -- src/openvpn/tls_crypt.h | 4 -- tests/unit_tests/openvpn/Makefile.am | 2 - tests/unit_tests/openvpn/test_tls_crypt.c | 4 -- 39 files changed, 50 insertions(+), 340 deletions(-)doc/doxygen/doc_data_crypto.h +5
-7@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external include/openvpn-plugin.h.in +2
-9@@ -26,7 +26,6 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO #ifdef ENABLE_CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED@@ -40,7 +39,6 @@ typedef mbedtls_x509_crt openvpn_x509_cert_t; typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };src/openvpn/crypto.c +0
-4@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h" @@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */ src/openvpn/crypto.h +0
-4@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h" @@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */ src/openvpn/crypto_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h" @@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* ENABLE_CRYPTO_MBEDTLS */ src/openvpn/crypto_mbedtls.h +0
-0@@ -26,8 +26,8 @@* @file Data Channel Cryptography mbed TLS-specific backend interface */
Quoted 6 lines
src/openvpn/crypto_mbedtls.h line 30
Quoted 4 lines
src/openvpn/crypto_mbedtls.h +2
-2-#ifndef CRYPTO_MBEDTLS_H_ -#define CRYPTO_MBEDTLS_H_ +#ifndef ENABLE_CRYPTO_MBEDTLS_H_ +#define ENABLE_CRYPTO_MBEDTLS_H_ I think these are changed accidentally?
Yes, you are right! Sorry about that, but I didn't see them while checking the patch before sending it.
Quoted 11 lines
src/openvpn/crypto_mbedtls.h mbed_log_func_line_lite(unsigned int flags, int errval, · line 150
Quoted 9 lines
src/openvpn/crypto_mbedtls.h +1
-1#include <mbedtls/cipher.h> #include <mbedtls/md.h> @@ -147,4 +147,4 @@ mbed_log_func_line_lite(unsigned int flags, int errval, mbed_log_func_line_lite(D_CRYPT_ERRORS, errval, __func__, __LINE__) -#endif /* CRYPTO_MBEDTLS_H_ */ +#endif /* ENABLE_CRYPTO_MBEDTLS_H_ */ As above.
yes
Quoted 28 lines
Quoted 28 lines
src/openvpn/crypto_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h" @@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* ENABLE_CRYPTO_OPENSSL */ src/openvpn/crypto_openssl.h +0
-0@@ -26,8 +26,8 @@* @file Data Channel Cryptography OpenSSL-specific backend interface */
Quoted 6 lines
src/openvpn/crypto_openssl.h line 30
Quoted 4 lines
src/openvpn/crypto_openssl.h +2
-2-#ifndef CRYPTO_OPENSSL_H_ -#define CRYPTO_OPENSSL_H_ +#ifndef ENABLE_CRYPTO_OPENSSL_H_ +#define ENABLE_CRYPTO_OPENSSL_H_ Same here,
yes
Quoted 11 lines
src/openvpn/crypto_openssl.h void crypto_print_openssl_errors(const unsigned int flags); · line 105
Quoted 9 lines
src/openvpn/crypto_openssl.h +1
-1#include <openssl/evp.h> #include <openssl/hmac.h> @@ -102,4 +102,4 @@ void crypto_print_openssl_errors(const unsigned int flags); } while (false) -#endif /* CRYPTO_OPENSSL_H_ */ +#endif /* ENABLE_CRYPTO_OPENSSL_H_ */ and here.
yes
Quoted 1,580 lines
Quoted 1,571 lines
src/openvpn/forward-inline.h +0
-6@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/* @@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/* @@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */ @@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled src/openvpn/forward.c +0
-15@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP @@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to. @@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/* @@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {src/openvpn/init.c +3
-61@@ -529,13 +529,11 @@ next_connection_entry(struct context *c)void init_query_passwords (const struct context *c) { -#ifdef ENABLE_CRYPTO /* Certificate password input */ if (c->options.key_pass_file) {pem_password_setup (c->options.key_pass_file); } -#endif #if P2MP /* Auth user/pass input */ @@ -704,7 +702,7 @@ init_static(void) {/* configure_path (); */ -#if defined(ENABLE_CRYPTO ) && defined(DMALLOC ) +#if defined(DMALLOC )crypto_init_dmalloc ();#endif @@ -741,14 +739,12 @@ init_static(void)update_time (); -#ifdef ENABLE_CRYPTO init_ssl_lib ();/* init PRNG used for IV generation */ /* When forking, copy this to more places in the code to avoid fork * random-state predictability */ prng_init (NULL ,0 ); -#endif #ifdef PID_TEST packet_id_interactive_test ();/* test the sequence number code */ @@ -942,9 +938,7 @@ init_static(void)void uninit_static (void ) { -#ifdef ENABLE_CRYPTO free_ssl_lib (); -#endif #ifdef ENABLE_PKCS11 pkcs11_terminate ();@@ -954,7 +948,7 @@ uninit_static(void)close_port_share ();#endif -#if defined(MEASURE_TLS_HANDSHAKE_STATS ) && defined(ENABLE_CRYPTO ) +#if defined(MEASURE_TLS_HANDSHAKE_STATS )show_tls_performance_stats ();#endif }@@ -998,7 +992,6 @@ print_openssl_info(const struct options *options)/* * OpenSSL info print mode? */ -#ifdef ENABLE_CRYPTO if (options->show_ciphers || options->show_digests || options->show_engines || options->show_tls_ciphers || options->show_curves) {@@ -1025,7 +1018,6 @@ print_openssl_info(const struct options *options) }return true; } -#endif /* ifdef ENABLE_CRYPTO */ return false; }@@ -1035,7 +1027,6 @@ print_openssl_info(const struct options *options)bool do_genkey (const struct options *options) { -#ifdef ENABLE_CRYPTO if (options->genkey) {int nbits_written;@@ -1055,7 +1046,6 @@ do_genkey(const struct options *options) options->shared_secret_file);return true; } -#endif return false; }@@ -1071,10 +1061,8 @@ do_persist_tuntap(const struct options *options)notnull (options->dev,"TUN/TAP device (--dev)" );if (options->ce.remote || options->ifconfig_local || options->ifconfig_remote_netmask -#ifdef ENABLE_CRYPTO || options->shared_secret_file || options->tls_server || options->tls_client -#endif ) { msg(M_FATAL|M_OPTERR,@@ -1226,12 +1214,10 @@ const char * format_common_name(struct context *c, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {buf_printf (&out,"[%s] " ,tls_common_name (c->c2.tls_multi, false)); } -#endif return BSTR (&out); }@@ -1333,7 +1319,6 @@ do_init_timers(struct context *c, bool deferred)#endif /* initialize packet_id persistence timer */ -#ifdef ENABLE_CRYPTO if (c->options.packet_id_file) {event_timeout_init (&c->c2.packet_id_persist_interval,60 , now);@@ -1342,7 +1327,6 @@ do_init_timers(struct context *c, bool deferred)/* initialize tmp_int optimization that limits the number of times we call * tls_multi_process in the main event loop */ interval_init (&c->c2.tmp_int,TLS_MULTI_HORIZON ,TLS_MULTI_REFRESH ); -#endif } }@@ -1485,7 +1469,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags)do_uid_gid_chroot (c, true); -#ifdef ENABLE_CRYPTO /* * In some cases (i.e. when receiving auth-token via * push-reply) the auth-nocache option configured on the @@ -1497,7 +1480,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags) {delayed_auth_pass_purge (); } -#endif /* ENABLE_CRYPTO */ /* Test if errors */ if (flags &ISC_ERRORS )@@ -2136,12 +2118,10 @@ pull_permission_mask(const struct context *c) flags |= (OPT_P_ROUTE |OPT_P_IPWIN32 ); } -#ifdef ENABLE_CRYPTO if (c->options.ncp_enabled) { flags |=OPT_P_NCP ; } -#endif return flags; }@@ -2230,7 +2210,6 @@ do_deferred_options(struct context *c, const unsigned int found)msg (D_PUSH ,"OPTIONS IMPORT: environment modified" ); } -#ifdef ENABLE_CRYPTO if (found &OPT_P_PEER_ID ) {msg (D_PUSH ,"OPTIONS IMPORT: peer-id set" );@@ -2271,7 +2250,7 @@ do_deferred_options(struct context *c, const unsigned int found)return false; } } -#endif /* ifdef ENABLE_CRYPTO */ +return true; }@@ -2423,19 +2402,15 @@ frame_finalize_options(struct context *c, const struct options *o)static void key_schedule_free (struct key_schedule *ks,bool free_ssl_ctx) { -#ifdef ENABLE_CRYPTO free_key_ctx_bi (&ks->static_key);if (tls_ctx_initialised (&ks->ssl_ctx) && free_ssl_ctx) {tls_ctx_free (&ks->ssl_ctx);free_key_ctx_bi (&ks->tls_wrap_key); } -#endif /* ENABLE_CRYPTO */ CLEAR (*ks); } -#ifdef ENABLE_CRYPTO -static void init_crypto_pre (struct context *c,const unsigned int flags) {@@ -2880,12 +2855,10 @@ do_init_crypto_none(const struct context *c)"protected against man-in-the-middle changes. " "PLEASE DO RECONSIDER THIS CONFIGURATION!"); } -#endif /* ifdef ENABLE_CRYPTO */ static void do_init_crypto (struct context *c,const unsigned int flags) { -#ifdef ENABLE_CRYPTO if (c->options.shared_secret_file) {do_init_crypto_static (c, flags);@@ -2898,11 +2871,6 @@ do_init_crypto(struct context *c, const unsigned int flags) {do_init_crypto_none (c); } -#else /* ENABLE_CRYPTO */ -msg (M_WARN , -"******* WARNING *******: " PACKAGE_NAME -" built without crypto library -- encryption and authentication features disabled -- all data will be tunnelled as cleartext" ); -#endif /* ENABLE_CRYPTO */ } static void@@ -3101,7 +3069,6 @@ do_option_warnings(struct context *c)#endif /* if P2MP_SERVER */ #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO if (!o->replay) {msg (M_WARN ,"WARNING: You have disabled Replay Protection (--no-replay) which may make " PACKAGE_NAME " less secure" );@@ -3123,7 +3090,6 @@ do_option_warnings(struct context *c) {msg (M_WARN ,"WARNING: --ns-cert-type is DEPRECATED. Use --remote-cert-tls instead." ); } -#endif /* ifdef ENABLE_CRYPTO */ /* If a script is used, print appropiate warnings */ if (o->user_script_used)@@ -3146,9 +3112,7 @@ do_option_warnings(struct context *c)static void do_init_frame_tls (struct context *c) { -#ifdef ENABLE_CRYPTO do_init_finalize_tls_frame (c); -#endif } struct context_buffers *@@ -3163,10 +3127,8 @@ init_context_buffers(const struct frame *frame) b->aux_buf =alloc_buf (BUF_SIZE (frame)); -#ifdef ENABLE_CRYPTO b->encrypt_buf =alloc_buf (BUF_SIZE (frame)); b->decrypt_buf =alloc_buf (BUF_SIZE (frame)); -#endif #ifdef USE_COMP b->compress_buf =alloc_buf (BUF_SIZE (frame));@@ -3190,10 +3152,8 @@ free_context_buffers(struct context_buffers *b)free_buf (&b->decompress_buf);#endif -#ifdef ENABLE_CRYPTO free_buf (&b->encrypt_buf);free_buf (&b->decrypt_buf); -#endif free (b); }@@ -3329,14 +3289,12 @@ do_compute_occ_strings(struct context *c)options_string_version (c->c2.options_string_remote, &gc), c->c2.options_string_remote); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_init_set_options (c->c2.tls_multi, c->c2.options_string_local, c->c2.options_string_remote); } -#endif gc_free (&gc); }@@ -3410,7 +3368,6 @@ do_close_free_buf(struct context *c)static void do_close_tls (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_free (c->c2.tls_multi, true);@@ -3429,7 +3386,6 @@ do_close_tls(struct context *c) } c->c2.options_string_local = c->c2.options_string_remote =NULL ;#endif -#endif }/* @@ -3494,14 +3450,12 @@ do_close_link_socket(struct context *c)static void do_close_packet_id (struct context *c) { -#ifdef ENABLE_CRYPTO packet_id_free (&c->c2.crypto_options.packet_id);packet_id_persist_save (&c->c1.pid_persist);if (!(c->sig->signal_received ==SIGUSR1 )) {packet_id_persist_close (&c->c1.pid_persist); } -#endif }#ifdef ENABLE_FRAGMENT @@ -3680,7 +3634,6 @@ do_setup_fast_io(struct context *c)static void do_signal_on_tls_errors (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->options.tls_exit) { c->c2.tls_exit_signal =SIGTERM ;@@ -3689,7 +3642,6 @@ do_signal_on_tls_errors(struct context *c) { c->c2.tls_exit_signal =SIGUSR1 ; } -#endif }#ifdef ENABLE_PLUGIN @@ -4369,7 +4321,6 @@ inherit_context_child(struct context *dest,/* c1 init */ packet_id_persist_init (&dest->c1.pid_persist); -#ifdef ENABLE_CRYPTO dest->c1.ks.key_type = src->c1.ks.key_type;/* inherit SSL context */ dest->c1.ks.ssl_ctx = src->c1.ks.ssl_ctx;@@ -4379,7 +4330,6 @@ inherit_context_child(struct context *dest, dest->c1.ciphername = src->c1.ciphername; dest->c1.authname = src->c1.authname; dest->c1.keysize = src->c1.keysize; -#endif /* options */ dest->options = src->options;@@ -4453,9 +4403,7 @@ inherit_context_top(struct context *dest,/* detach plugins */ dest->plugins_owned = false; -#ifdef ENABLE_CRYPTO dest->c2.tls_multi =NULL ; -#endif /* detach c1 ownership */ dest->c1.tuntap_owned = false;@@ -4513,8 +4461,6 @@ close_context(struct context *c, int sig, unsigned int flags) } } -#ifdef ENABLE_CRYPTO -/* * Do a loopback test * on the crypto subsystem. @@ -4542,12 +4488,9 @@ test_crypto_thread(void *arg)return NULL ; } -#endif /* ENABLE_CRYPTO */ -bool do_test_crypto (const struct options *o) { -#ifdef ENABLE_CRYPTO if (o->test_crypto) {struct context c;@@ -4562,6 +4505,5 @@ do_test_crypto(const struct options *o)test_crypto_thread ((void *) &c);return true; } -#endif return false; }src/openvpn/manage.c +1
-4@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );src/openvpn/misc.c +0
-13@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov. @@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */ src/openvpn/misc.h +1
-6@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/* src/openvpn/openvpn.h +0
-24@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/* @@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP @@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */ @@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the @@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFFsrc/openvpn/options.c +5
-50@@ -67,7 +67,6 @@ const char title_string[] = " [git:" CONFIGURE_GIT_REVISION CONFIGURE_GIT_FLAGS "]"#endif " " TARGET_ALIAS -#ifdef ENABLE_CRYPTO #if defined(ENABLE_CRYPTO_MBEDTLS ) " [SSL (mbed TLS)]"#elif defined(ENABLE_CRYPTO_OPENSSL )@@ -75,7 +74,6 @@ const char title_string[] =#else " [SSL]"#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ -#endif /* ENABLE_CRYPTO */ #ifdef USE_COMP #ifdef ENABLE_LZO " [LZO]" @@ -518,7 +516,6 @@ static const char usage_message[] ="--explicit-exit-notify [n] : On exit/restart, send exit signal to\n" " server/remote. n = # of retries, default=1.\n"#endif -#ifdef ENABLE_CRYPTO "\n" "Data Channel Encryption Options (must be compatible between peers):\n" "(These options are meaningful for both Static Key & TLS-mode)\n" @@ -748,7 +745,6 @@ static const char usage_message[] ="--genkey : Generate a random key to be used as a shared secret,\n" " for use with the --secret option.\n" "--secret file : Write key to file.\n" -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_FEATURE_TUN_PERSIST"\n" "Tun/tap config mode (available with linux 2.4+):\n" @@ -852,7 +848,6 @@ init_options(struct options *o, const bool init_gc)#if P2MP o->scheduled_exit_interval =5 ;#endif -#ifdef ENABLE_CRYPTO o->ciphername ="BF-CBC" ;#ifdef HAVE_AEAD_CIPHER_MODES /* IV_NCP=2 requires GCM support */ o->ncp_enabled = true;@@ -882,7 +877,6 @@ init_options(struct options *o, const bool init_gc)#ifdef ENABLE_X509ALTUSERNAME o->x509_username_field =X509_USERNAME_FIELD_DEFAULT ;#endif -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 o->pkcs11_pin_cache_period =-1 ;#endif /* ENABLE_PKCS11 */ @@ -1146,7 +1140,6 @@ string_substitute(const char *src, int from, int to, struct gc_arena *gc)return ret; } -#ifdef ENABLE_CRYPTO static uint8_t *parse_hash_fingerprint (const char *str,int nbytes,int msglevel,struct gc_arena *gc) {@@ -1188,7 +1181,6 @@ parse_hash_fingerprint(const char *str, int nbytes, int msglevel, struct gc_aren }return ret; } -#endif /* ifdef ENABLE_CRYPTO */ #ifdef _WIN32@@ -1560,14 +1552,12 @@ show_settings(const struct options *o)SHOW_INT (persist_mode);#endif -#ifdef ENABLE_CRYPTO SHOW_BOOL (show_ciphers);SHOW_BOOL (show_digests);SHOW_BOOL (show_engines);SHOW_BOOL (genkey);SHOW_STR (key_pass_file);SHOW_BOOL (show_tls_ciphers); -#endif SHOW_INT (connect_retry_max);show_connection_entries (o);@@ -1702,7 +1692,6 @@ show_settings(const struct options *o) }#endif -#ifdef ENABLE_CRYPTO SHOW_STR (shared_secret_file);SHOW_INT (key_direction);SHOW_STR (ciphername);@@ -1790,7 +1779,6 @@ show_settings(const struct options *o)SHOW_STR (tls_auth_file);SHOW_STR (tls_crypt_file); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 {@@ -2024,14 +2012,14 @@ options_postprocess_verify_ce(const struct options *options, const struct connecinit_options (&defaults, true); -#ifdef ENABLE_CRYPTO if (options->test_crypto) {notnull (options->shared_secret_file,"key file (--secret)" ); }else -#endif -notnull (options->dev,"TUN/TAP device (--dev)" ); + { +notnull (options->dev,"TUN/TAP device (--dev)" ); + }/* * Get tun/tap/null device type @@ -2072,10 +2060,7 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }if (options->inetd ==INETD_NOWAIT -#ifdef ENABLE_CRYPTO - && !(options->tls_server || options->tls_client) -#endif - ) + && !(options->tls_server || options->tls_client)) {msg (M_USAGE ,"--inetd nowait can only be used in TLS mode" ); }@@ -2485,8 +2470,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }#endif /* P2MP_SERVER */ -#ifdef ENABLE_CRYPTO -if (options->ncp_enabled && !tls_check_ncp_cipher_list (options->ncp_ciphers)) {msg (M_USAGE ,"NCP cipher list contains unsupported ciphers." );@@ -2771,7 +2754,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec } }#undef MUST_BE_UNDEF -#endif /* ENABLE_CRYPTO */ #if P2MP if (options->auth_user_pass_file && !options->pull)@@ -3009,7 +2991,6 @@ options_postprocess_mutate(struct options *o)options_postprocess_mutate_ce (o, o->connection_list->array[i]); } -#ifdef ENABLE_CRYPTO if (o->tls_server) {/* Check that DH file is specified, or explicitly disabled */ @@ -3035,7 +3016,6 @@ options_postprocess_mutate(struct options *o) "in P2MP client or server mode" ); o->ncp_enabled = false; } -#endif #if ENABLE_MANAGEMENT if (o->http_proxy_override)@@ -3267,7 +3247,6 @@ options_postprocess_filechecks(struct options *options) {bool errs = false; -#ifdef ENABLE_CRYPTO /* ** SSL/TLS/crypto related files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" );@@ -3308,7 +3287,6 @@ options_postprocess_filechecks(struct options *options)/* ** Password files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_ACPTSTDIN |CHKACC_PRIVATE , options->key_pass_file,R_OK ,"--askpass" ); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_MANAGEMENT errs |= check_file_access(CHKACC_FILE|CHKACC_ACPTSTDIN|CHKACC_PRIVATE, options->management_user_pass, R_OK,@@ -3331,10 +3309,8 @@ options_postprocess_filechecks(struct options *options) R_OK|W_OK, "--status");/* ** Config related ** */ -#ifdef ENABLE_CRYPTO errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" ); -#endif /* ENABLE_CRYPTO */ #if P2MP_SERVER errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" );@@ -3462,7 +3438,7 @@ static size_t calc_options_string_link_mtu(const struct options *o, const struct frame *frame) { size_t link_mtu = EXPANDED_SIZE(frame); -#ifdef ENABLE_CRYPTO +if (o->pull || o->mode ==MODE_SERVER ) {struct frame fake_frame = *frame;@@ -3478,7 +3454,6 @@ calc_options_string_link_mtu(const struct options *o, const struct frame *frame) EXPANDED_SIZE(&fake_frame)); link_mtu =EXPANDED_SIZE (&fake_frame); } -#endif return link_mtu; }@@ -3606,8 +3581,6 @@ options_string(const struct options *o, }#endif -#ifdef ENABLE_CRYPTO -#define TLS_CLIENT (o->tls_client)#define TLS_SERVER (o->tls_server)@@ -3705,8 +3678,6 @@ options_string(const struct options *o,#undef TLS_CLIENT#undef TLS_SERVER -#endif /* ENABLE_CRYPTO */ -return BSTR (&out); }@@ -4084,7 +4055,6 @@ usage(void)struct options o;init_options (&o, true); -#ifdef ENABLE_CRYPTO fprintf(fp, usage_message, title_string, o.ce.connect_retry_seconds,@@ -4096,15 +4066,6 @@ usage(void) o.replay_window, o.replay_time, o.tls_timeout, o.renegotiate_seconds, o.handshake_window, o.transition_window); -#else /* ifdef ENABLE_CRYPTO */ -fprintf (fp, usage_message, - title_string, - o.ce.connect_retry_seconds, - o.ce.connect_retry_seconds_max, - o.ce.local_port, o.ce.remote_port, -TUN_MTU_DEFAULT ,TAP_MTU_EXTRA_DEFAULT , - o.verbosity); -#endif fflush (fp);#endif /* ENABLE_SMALL */ @@ -4132,11 +4093,7 @@ show_windows_version(const unsigned int flags)void show_library_versions (const unsigned int flags) { -#ifdef ENABLE_CRYPTO #define SSL_LIB_VER_STR get_ssl_library_version() -#else -#define SSL_LIB_VER_STR "" -#endif #ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string()#else @@ -7441,7 +7398,6 @@ add_option(struct options *options, } }#endif /* USE_COMP */ -#ifdef ENABLE_CRYPTO else if (streq(p[0], "show-ciphers") && !p[1]) {VERIFY_PERMISSION (OPT_P_GENERAL );@@ -8124,7 +8080,6 @@ add_option(struct options *options, options->x509_username_field = p[1 ]; }#endif /* ENABLE_X509ALTUSERNAME */ -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 else if (streq(p[0], "show-pkcs11-ids") && !p[3]) {src/openvpn/options.h +1
-8@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /* @@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif @@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */ src/openvpn/packet_id.c +0
-4@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h" @@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */ src/openvpn/packet_id.h +0
-3@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H @@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/plugin.c +6
-17@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {src/openvpn/plugin.h +5
-13@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */ src/openvpn/reliable.c +0
-9@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h" @@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/reliable.h +0
-3@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H @@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.c +0
-9@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h" @@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.h +0
-3@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H @@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.c +0
-9@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h" @@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.h +0
-4@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h" @@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */ src/openvpn/ssl_backend.h +0
-3@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. * @@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */ src/openvpn/ssl_mbedtls.c +2
-2@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h" @@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h" @@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/ssl_verify.c +0
-4@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h" @@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl_verify.h +0
-4@@ -29,8 +29,6 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h" @@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */ src/openvpn/ssl_verify_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h" @@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_verify_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "ssl_verify_openssl.h" @@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/syshead.h +3
-13@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0@@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif @@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif @@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support src/openvpn/tls_crypt.c +0
-3@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h" @@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */ src/openvpn/tls_crypt.h +0
-4@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h" @@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */ tests/unit_tests/openvpn/Makefile.am +0
-2@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif TESTS = $(check_PROGRAMS)tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h> tests/unit_tests/openvpn/test_tls_crypt.c main(void) { · line 272
Quoted 5 lines
tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -268,5 +266,3 @@ main(void) {return ret; } - -#endif /* ENABLE_CRYPTO */ Otherwise this looks good. So, provided that the above accidental changes are removed:
Quoted 2 lines
will send v3 with these fixed.
Cheers,
Quoted 10 lines
-Steffan
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openvpn-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Signature · 1 line
Antonio Quartulli
PATCH v3 1/1 Remove ENABLE_CRYPTO
The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
Signed-off-by Antonio Quartulli <[email protected]...>
---
v3:
- revert accidental changes to CRYPTO_MBEDTLS/OPENSSL_H_
v2:
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL
- move to first patch in the set to avoid having a point in the tree where encryption is disabled
doc/doxygen/doc_data_crypto.h | 12 +++--- include/openvpn-plugin.h.in | 11 +----- src/openvpn/crypto.c | 4 -- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/forward-inline.h | 6 --- src/openvpn/forward.c | 15 -------- src/openvpn/init.c | 64 ++----------------------------- src/openvpn/manage.c | 5 +-- src/openvpn/misc.c | 13 ------- src/openvpn/misc.h | 7 +--- src/openvpn/openvpn.h | 24 ------------ src/openvpn/options.c | 55 +++----------------------- src/openvpn/options.h | 9 +---- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 -- src/openvpn/plugin.c | 23 +++-------- src/openvpn/plugin.h | 18 +++------ src/openvpn/reliable.c | 9 ----- src/openvpn/reliable.h | 3 -- src/openvpn/session_id.c | 9 ----- src/openvpn/session_id.h | 3 -- src/openvpn/ssl.c | 9 ----- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 3 -- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 4 +- src/openvpn/ssl_verify.c | 4 -- src/openvpn/ssl_verify.h | 4 -- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 16 ++------ src/openvpn/tls_crypt.c | 3 -- src/openvpn/tls_crypt.h | 4 -- tests/unit_tests/openvpn/Makefile.am | 2 - tests/unit_tests/openvpn/test_tls_crypt.c | 4 -- 37 files changed, 44 insertions(+), 334 deletions(-)
doc/doxygen/doc_data_crypto.h +5 -7
@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external
include/openvpn-plugin.h.in +2 -9
@@ -26,7 +26,6 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO #ifdef ENABLE_CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED
@@ -40,7 +39,6 @@ typedef mbedtls_x509_crt openvpn_x509_cert_t; typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>
@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in
@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };
src/openvpn/crypto.c +0 -4
@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h"
@@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */
src/openvpn/crypto.h +0 -4
@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h"
@@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */
src/openvpn/crypto_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h"
@@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* ENABLE_CRYPTO_MBEDTLS */
src/openvpn/crypto_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h"
@@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* ENABLE_CRYPTO_OPENSSL */
src/openvpn/forward-inline.h +0 -6
@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/*
@@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);
@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/*
@@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */
@@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled
src/openvpn/forward.c +0 -15
@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {
@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP
@@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();
@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }
@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));
@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to.
@@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);
@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/*
@@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {
@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )
@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {
src/openvpn/init.c +3 -61
347 lines not on this page · raw message
src/openvpn/manage.c +1 -4
@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void
@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );
src/openvpn/misc.c +0 -13
@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov.
@@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */
src/openvpn/misc.h +1 -6
@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);
@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/*
src/openvpn/openvpn.h +0 -24
@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;
@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/*
@@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP
@@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */
@@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the
@@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \
@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFF
src/openvpn/options.c +5 -50
243 lines not on this page · raw message
src/openvpn/options.h +1 -8
@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /*
@@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif
@@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;
@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;
@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;
@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */
src/openvpn/packet_id.c +0 -4
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h"
@@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */
src/openvpn/packet_id.h +0 -3
@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H
@@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/plugin.c +6 -17
@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;
@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;
@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)
@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {
src/openvpn/plugin.h +5 -13
@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);
@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;
@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */
src/openvpn/reliable.c +0 -9
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h"
@@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/reliable.h +0 -3
@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H
@@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.c +0 -9
@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h"
@@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/session_id.h +0 -3
@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H
@@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.c +0 -9
@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h"
@@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl.h +0 -4
@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h"
@@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */
src/openvpn/ssl_backend.h +0 -3
@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. *
@@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */
src/openvpn/ssl_mbedtls.c +2 -2
@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h"
@@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */
src/openvpn/ssl_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h"
@@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */
src/openvpn/ssl_verify.c +0 -4
@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h"
@@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */
src/openvpn/ssl_verify.h +0 -4
@@ -29,8 +29,6 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h"
@@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */
src/openvpn/ssl_verify_mbedtls.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h"
@@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(ENABLE_CRYPTO_MBEDTLS) */
src/openvpn/ssl_verify_openssl.c +2 -2
@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "ssl_verify_openssl.h"
@@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */
src/openvpn/syshead.h +3 -13
@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0
@@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif
@@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif
@@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support
src/openvpn/tls_crypt.c +0 -3
@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h"
@@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */
src/openvpn/tls_crypt.h +0 -4
@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h"
@@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */
tests/unit_tests/openvpn/Makefile.am +0 -2
@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif TESTS = $(check_PROGRAMS)
tests/unit_tests/openvpn/test_tls_crypt.c +0 -4
@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h>
@@ -268,5 +266,3 @@ main(void) {return ret; } - -#endif /* ENABLE_CRYPTO */
Signature · 1 line
2.15.1
Re: [Openvpn-devel] [PATCH v3] Remove ENABLE_CRYPTO
Hi,
Quoted 1,774 lines · Antonio Quartulli
The crypto engine cannot be disabled anymore, therefore get rid of all the related ifdefs in the code.
This change makes the code simpler and reduces our the number of config combinations we have to test after a new change is applied.
Signed-off-by Antonio Quartulli <[email protected]...>---
v3:
- revert accidental changes to CRYPTO_MBEDTLS/OPENSSL_H_v2:
- rename CRYPTO_MBEDTLS/OPENSSL back to ENABLE_CRYPTO_MBEDTLS/OPENSSL
- move to first patch in the set to avoid having a point in the tree where encryption is disableddoc/doxygen/doc_data_crypto.h | 12 +++--- include/openvpn-plugin.h.in | 11 +----- src/openvpn/crypto.c | 4 -- src/openvpn/crypto.h | 4 -- src/openvpn/crypto_mbedtls.c | 4 +- src/openvpn/crypto_openssl.c | 4 +- src/openvpn/forward-inline.h | 6 --- src/openvpn/forward.c | 15 -------- src/openvpn/init.c | 64 ++----------------------------- src/openvpn/manage.c | 5 +-- src/openvpn/misc.c | 13 ------- src/openvpn/misc.h | 7 +--- src/openvpn/openvpn.h | 24 ------------ src/openvpn/options.c | 55 +++----------------------- src/openvpn/options.h | 9 +---- src/openvpn/packet_id.c | 4 -- src/openvpn/packet_id.h | 3 -- src/openvpn/plugin.c | 23 +++-------- src/openvpn/plugin.h | 18 +++------ src/openvpn/reliable.c | 9 ----- src/openvpn/reliable.h | 3 -- src/openvpn/session_id.c | 9 ----- src/openvpn/session_id.h | 3 -- src/openvpn/ssl.c | 9 ----- src/openvpn/ssl.h | 4 -- src/openvpn/ssl_backend.h | 3 -- src/openvpn/ssl_mbedtls.c | 4 +- src/openvpn/ssl_openssl.c | 4 +- src/openvpn/ssl_verify.c | 4 -- src/openvpn/ssl_verify.h | 4 -- src/openvpn/ssl_verify_mbedtls.c | 4 +- src/openvpn/ssl_verify_openssl.c | 4 +- src/openvpn/syshead.h | 16 ++------ src/openvpn/tls_crypt.c | 3 -- src/openvpn/tls_crypt.h | 4 -- tests/unit_tests/openvpn/Makefile.am | 2 - tests/unit_tests/openvpn/test_tls_crypt.c | 4 -- 37 files changed, 44 insertions(+), 334 deletions(-)doc/doxygen/doc_data_crypto.h +5
-7@@ -58,13 +58,11 @@* - \c openvpn_decrypt() * * @par Settings that control this module's activity -* Whether or not the Data Channel Crypto module is active depends on the -* compile-time \c ENABLE_CRYPTO preprocessor macro. How it processes packets -* received from the \link data_control Data Channel Control module\endlink at -* runtime depends on the associated \c crypto_options structure. To perform -* cryptographic operations, the \c crypto_options.key_ctx_bi must contain the -* correct cipher and HMAC security parameters for the direction the packet is -* traveling in. +* How the data channel processes packets received from the \link data_control +* Data Channel Control module\endlink at runtime depends on the associated +* \c crypto_options structure. To perform cryptographic operations, the +* \c crypto_options.key_ctx_bi must contain the correct cipher and HMAC +* security parameters for the direction the packet is traveling in. * * @par Crypto algorithms * This module uses the crypto algorithm implementations of the external include/openvpn-plugin.h.in +2
-9@@ -26,7 +26,6 @@ #define OPENVPN_PLUGIN_VERSION 3 -#ifdef ENABLE_CRYPTO #ifdef ENABLE_CRYPTO_MBEDTLS #include <mbedtls/x509_crt.h> #ifndef __OPENVPN_X509_CERT_T_DECLARED@@ -40,7 +39,6 @@ typedef mbedtls_x509_crt openvpn_x509_cert_t; typedef X509 openvpn_x509_cert_t; #endif #endif -#endif #include <stdarg.h> #include <stddef.h>@@ -391,9 +389,9 @@ struct openvpn_plugin_args_open_return * *per_client_context : the per-client context pointer which was returned by * openvpn_plugin_client_constructor_v1, if defined. * - * current_cert_depth : Certificate depth of the certificate being passed over (only if compiled with ENABLE_CRYPTO defined) + * current_cert_depth : Certificate depth of the certificate being passed over * - * *current_cert : X509 Certificate object received from the client (only if compiled with ENABLE_CRYPTO defined) + * *current_cert : X509 Certificate object received from the client * */ struct openvpn_plugin_args_func_in@@ -403,13 +401,8 @@ struct openvpn_plugin_args_func_in const char **const envp; openvpn_plugin_handle_t handle; void *per_client_context; -#ifdef ENABLE_CRYPTO int current_cert_depth; openvpn_x509_cert_t *current_cert; -#else - int __current_cert_depth_disabled; /* Unused, for compatibility purposes only */ - void *__current_cert_disabled; /* Unused, for compatibility purposes only */ -#endif };src/openvpn/crypto.c +0
-4@@ -30,8 +30,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "crypto.h" #include "error.h" #include "integer.h" @@ -1842,5 +1840,3 @@ translate_cipher_name_to_openvpn(const char *cipher_name)return pair->openvpn_name; } - -#endif /* ENABLE_CRYPTO */ src/openvpn/crypto.h +0
-4@@ -122,8 +122,6 @@#ifndef CRYPTO_H #define CRYPTO_H -#ifdef ENABLE_CRYPTO -#include "crypto_backend.h" #include "basic.h" #include "buffer.h" @@ -513,6 +511,4 @@ key_ctx_bi_defined(const struct key_ctx_bi *key) return key->encrypt.cipher || key->encrypt.hmac || key->decrypt.cipher || key->decrypt.hmac; } - -#endif /* ENABLE_CRYPTO */ #endif /* CRYPTO_H */ src/openvpn/crypto_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "basic.h" @@ -903,4 +903,4 @@ hmac_ctx_final(mbedtls_md_context_t *ctx, uint8_t *dst) ASSERT(0 == mbedtls_md_hmac_finish(ctx, dst)); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_MBEDTLS */ +#endif /* ENABLE_CRYPTO_MBEDTLS */ src/openvpn/crypto_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "basic.h" #include "buffer.h" @@ -969,4 +969,4 @@ hmac_ctx_final(HMAC_CTX *ctx, uint8_t *dst) HMAC_Final(ctx, dst, &in_hmac_len); } -#endif /* ENABLE_CRYPTO && ENABLE_CRYPTO_OPENSSL */ +#endif /* ENABLE_CRYPTO_OPENSSL */ src/openvpn/forward-inline.h +0
-6@@ -34,14 +34,12 @@static inline void check_tls (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_dowork (struct context *c);if (c->c2.tls_multi) {check_tls_dowork (c); } -#endif }/* @@ -51,7 +49,6 @@ check_tls(struct context *c)static inline void check_tls_errors (struct context *c) { -#if defined(ENABLE_CRYPTO )void check_tls_errors_co (struct context *c);void check_tls_errors_nco (struct context *c);@@ -73,7 +70,6 @@ check_tls_errors(struct context *c) } } } -#endif /* if defined(ENABLE_CRYPTO) */ }/* @@ -220,7 +216,6 @@ check_push_request(struct context *c)#endif -#ifdef ENABLE_CRYPTO /* * Should we persist our anti-replay packet ID state to disk? */ @@ -233,7 +228,6 @@ check_packet_id_persist_flush(struct context *c)packet_id_persist_save (&c->c1.pid_persist); } } -#endif /* * Set our wakeup to 0 seconds, so we will be rescheduled src/openvpn/forward.c +0
-15@@ -87,7 +87,6 @@ show_wait_status(struct context *c)* traffic on the control-channel. * */ -#ifdef ENABLE_CRYPTO void check_tls_dowork (struct context *c) {@@ -131,7 +130,6 @@ check_tls_errors_nco(struct context *c) {register_signal (c, c->c2.tls_exit_signal,"tls-error" );/* SOFT-SIGUSR1 -- TLS error */ } -#endif /* ENABLE_CRYPTO */ #if P2MP @@ -248,7 +246,6 @@ check_connection_established_dowork(struct context *c)bool send_control_channel_string (struct context *c,const char *str,int msglevel) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {struct gc_arena gc =gc_new ();@@ -274,7 +271,6 @@ send_control_channel_string(struct context *c, const char *str, int msglevel)gc_free (&gc);return stat; } -#endif /* ENABLE_CRYPTO */ return true; }@@ -485,7 +481,6 @@ encrypt_sign(struct context *c, bool comp_frag)#endif } -#ifdef ENABLE_CRYPTO /* initialize work buffer with FRAME_HEADROOM bytes of prepend capacity */ ASSERT (buf_init (&b->encrypt_buf,FRAME_HEADROOM (&c->c2.frame)));@@ -518,7 +513,6 @@ encrypt_sign(struct context *c, bool comp_frag) }tls_post_encrypt (c->c2.tls_multi, &c->c2.buf); } -#endif /* ifdef ENABLE_CRYPTO */ /* * Get the address we will be sending the packet to. @@ -536,11 +530,9 @@ encrypt_sign(struct context *c, bool comp_frag)static void process_coarse_timers (struct context *c) { -#ifdef ENABLE_CRYPTO /* flush current packet-id to file once per 60 * seconds if --replay-persist was specified */ check_packet_id_persist_flush (c); -#endif /* should we update status file? */ check_status_file (c);@@ -852,7 +844,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boolink_socket_bad_incoming_addr (&c->c2.buf, lsi, &c->c2.from); } -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {/* @@ -909,9 +900,6 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, booregister_signal (c,SIGUSR1 ,"decryption-error" );/* SOFT-SIGUSR1 -- decryption error in TCP mode */ msg (D_STREAM_ERRORS ,"Fatal decryption error (process_incoming_link), restarting" ); } -#else /* ENABLE_CRYPTO */ - decrypt_status = true; -#endif /* ENABLE_CRYPTO */ }else {@@ -1426,8 +1414,6 @@ process_outgoing_link(struct context *c)register_activity (c, size); } - -#ifdef ENABLE_CRYPTO /* for unreachable network and "connecting" state switch to the next host */ if (size <0 &&ENETUNREACH == error_code && c->c2.tls_multi && !tls_initial_packet_received (c->c2.tls_multi) && c->options.mode ==MODE_POINT_TO_POINT )@@ -1435,7 +1421,6 @@ process_outgoing_link(struct context *c)msg (M_INFO ,"Network unreachable, restarting" );register_signal (c,SIGUSR1 ,"network-unreachable" ); } -#endif }else {src/openvpn/init.c +3
-61@@ -529,13 +529,11 @@ next_connection_entry(struct context *c)void init_query_passwords (const struct context *c) { -#ifdef ENABLE_CRYPTO /* Certificate password input */ if (c->options.key_pass_file) {pem_password_setup (c->options.key_pass_file); } -#endif #if P2MP /* Auth user/pass input */ @@ -704,7 +702,7 @@ init_static(void) {/* configure_path (); */ -#if defined(ENABLE_CRYPTO ) && defined(DMALLOC ) +#if defined(DMALLOC )crypto_init_dmalloc ();#endif @@ -741,14 +739,12 @@ init_static(void)update_time (); -#ifdef ENABLE_CRYPTO init_ssl_lib ();/* init PRNG used for IV generation */ /* When forking, copy this to more places in the code to avoid fork * random-state predictability */ prng_init (NULL ,0 ); -#endif #ifdef PID_TEST packet_id_interactive_test ();/* test the sequence number code */ @@ -942,9 +938,7 @@ init_static(void)void uninit_static (void ) { -#ifdef ENABLE_CRYPTO free_ssl_lib (); -#endif #ifdef ENABLE_PKCS11 pkcs11_terminate ();@@ -954,7 +948,7 @@ uninit_static(void)close_port_share ();#endif -#if defined(MEASURE_TLS_HANDSHAKE_STATS ) && defined(ENABLE_CRYPTO ) +#if defined(MEASURE_TLS_HANDSHAKE_STATS )show_tls_performance_stats ();#endif }@@ -998,7 +992,6 @@ print_openssl_info(const struct options *options)/* * OpenSSL info print mode? */ -#ifdef ENABLE_CRYPTO if (options->show_ciphers || options->show_digests || options->show_engines || options->show_tls_ciphers || options->show_curves) {@@ -1025,7 +1018,6 @@ print_openssl_info(const struct options *options) }return true; } -#endif /* ifdef ENABLE_CRYPTO */ return false; }@@ -1035,7 +1027,6 @@ print_openssl_info(const struct options *options)bool do_genkey (const struct options *options) { -#ifdef ENABLE_CRYPTO if (options->genkey) {int nbits_written;@@ -1055,7 +1046,6 @@ do_genkey(const struct options *options) options->shared_secret_file);return true; } -#endif return false; }@@ -1071,10 +1061,8 @@ do_persist_tuntap(const struct options *options)notnull (options->dev,"TUN/TAP device (--dev)" );if (options->ce.remote || options->ifconfig_local || options->ifconfig_remote_netmask -#ifdef ENABLE_CRYPTO || options->shared_secret_file || options->tls_server || options->tls_client -#endif ) { msg(M_FATAL|M_OPTERR,@@ -1226,12 +1214,10 @@ const char * format_common_name(struct context *c, struct gc_arena *gc) { struct buffer out = alloc_buf_gc(256, gc); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {buf_printf (&out,"[%s] " ,tls_common_name (c->c2.tls_multi, false)); } -#endif return BSTR (&out); }@@ -1333,7 +1319,6 @@ do_init_timers(struct context *c, bool deferred)#endif /* initialize packet_id persistence timer */ -#ifdef ENABLE_CRYPTO if (c->options.packet_id_file) {event_timeout_init (&c->c2.packet_id_persist_interval,60 , now);@@ -1342,7 +1327,6 @@ do_init_timers(struct context *c, bool deferred)/* initialize tmp_int optimization that limits the number of times we call * tls_multi_process in the main event loop */ interval_init (&c->c2.tmp_int,TLS_MULTI_HORIZON ,TLS_MULTI_REFRESH ); -#endif } }@@ -1485,7 +1469,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags)do_uid_gid_chroot (c, true); -#ifdef ENABLE_CRYPTO /* * In some cases (i.e. when receiving auth-token via * push-reply) the auth-nocache option configured on the @@ -1497,7 +1480,6 @@ initialization_sequence_completed(struct context *c, const unsigned int flags) {delayed_auth_pass_purge (); } -#endif /* ENABLE_CRYPTO */ /* Test if errors */ if (flags &ISC_ERRORS )@@ -2136,12 +2118,10 @@ pull_permission_mask(const struct context *c) flags |= (OPT_P_ROUTE |OPT_P_IPWIN32 ); } -#ifdef ENABLE_CRYPTO if (c->options.ncp_enabled) { flags |=OPT_P_NCP ; } -#endif return flags; }@@ -2230,7 +2210,6 @@ do_deferred_options(struct context *c, const unsigned int found)msg (D_PUSH ,"OPTIONS IMPORT: environment modified" ); } -#ifdef ENABLE_CRYPTO if (found &OPT_P_PEER_ID ) {msg (D_PUSH ,"OPTIONS IMPORT: peer-id set" );@@ -2271,7 +2250,7 @@ do_deferred_options(struct context *c, const unsigned int found)return false; } } -#endif /* ifdef ENABLE_CRYPTO */ +return true; }@@ -2423,19 +2402,15 @@ frame_finalize_options(struct context *c, const struct options *o)static void key_schedule_free (struct key_schedule *ks,bool free_ssl_ctx) { -#ifdef ENABLE_CRYPTO free_key_ctx_bi (&ks->static_key);if (tls_ctx_initialised (&ks->ssl_ctx) && free_ssl_ctx) {tls_ctx_free (&ks->ssl_ctx);free_key_ctx_bi (&ks->tls_wrap_key); } -#endif /* ENABLE_CRYPTO */ CLEAR (*ks); } -#ifdef ENABLE_CRYPTO -static void init_crypto_pre (struct context *c,const unsigned int flags) {@@ -2880,12 +2855,10 @@ do_init_crypto_none(const struct context *c)"protected against man-in-the-middle changes. " "PLEASE DO RECONSIDER THIS CONFIGURATION!"); } -#endif /* ifdef ENABLE_CRYPTO */ static void do_init_crypto (struct context *c,const unsigned int flags) { -#ifdef ENABLE_CRYPTO if (c->options.shared_secret_file) {do_init_crypto_static (c, flags);@@ -2898,11 +2871,6 @@ do_init_crypto(struct context *c, const unsigned int flags) {do_init_crypto_none (c); } -#else /* ENABLE_CRYPTO */ -msg (M_WARN , -"******* WARNING *******: " PACKAGE_NAME -" built without crypto library -- encryption and authentication features disabled -- all data will be tunnelled as cleartext" ); -#endif /* ENABLE_CRYPTO */ } static void@@ -3101,7 +3069,6 @@ do_option_warnings(struct context *c)#endif /* if P2MP_SERVER */ #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO if (!o->replay) {msg (M_WARN ,"WARNING: You have disabled Replay Protection (--no-replay) which may make " PACKAGE_NAME " less secure" );@@ -3123,7 +3090,6 @@ do_option_warnings(struct context *c) {msg (M_WARN ,"WARNING: --ns-cert-type is DEPRECATED. Use --remote-cert-tls instead." ); } -#endif /* ifdef ENABLE_CRYPTO */ /* If a script is used, print appropiate warnings */ if (o->user_script_used)@@ -3146,9 +3112,7 @@ do_option_warnings(struct context *c)static void do_init_frame_tls (struct context *c) { -#ifdef ENABLE_CRYPTO do_init_finalize_tls_frame (c); -#endif } struct context_buffers *@@ -3163,10 +3127,8 @@ init_context_buffers(const struct frame *frame) b->aux_buf =alloc_buf (BUF_SIZE (frame)); -#ifdef ENABLE_CRYPTO b->encrypt_buf =alloc_buf (BUF_SIZE (frame)); b->decrypt_buf =alloc_buf (BUF_SIZE (frame)); -#endif #ifdef USE_COMP b->compress_buf =alloc_buf (BUF_SIZE (frame));@@ -3190,10 +3152,8 @@ free_context_buffers(struct context_buffers *b)free_buf (&b->decompress_buf);#endif -#ifdef ENABLE_CRYPTO free_buf (&b->encrypt_buf);free_buf (&b->decrypt_buf); -#endif free (b); }@@ -3329,14 +3289,12 @@ do_compute_occ_strings(struct context *c)options_string_version (c->c2.options_string_remote, &gc), c->c2.options_string_remote); -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_init_set_options (c->c2.tls_multi, c->c2.options_string_local, c->c2.options_string_remote); } -#endif gc_free (&gc); }@@ -3410,7 +3368,6 @@ do_close_free_buf(struct context *c)static void do_close_tls (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->c2.tls_multi) {tls_multi_free (c->c2.tls_multi, true);@@ -3429,7 +3386,6 @@ do_close_tls(struct context *c) } c->c2.options_string_local = c->c2.options_string_remote =NULL ;#endif -#endif }/* @@ -3494,14 +3450,12 @@ do_close_link_socket(struct context *c)static void do_close_packet_id (struct context *c) { -#ifdef ENABLE_CRYPTO packet_id_free (&c->c2.crypto_options.packet_id);packet_id_persist_save (&c->c1.pid_persist);if (!(c->sig->signal_received ==SIGUSR1 )) {packet_id_persist_close (&c->c1.pid_persist); } -#endif }#ifdef ENABLE_FRAGMENT @@ -3680,7 +3634,6 @@ do_setup_fast_io(struct context *c)static void do_signal_on_tls_errors (struct context *c) { -#ifdef ENABLE_CRYPTO if (c->options.tls_exit) { c->c2.tls_exit_signal =SIGTERM ;@@ -3689,7 +3642,6 @@ do_signal_on_tls_errors(struct context *c) { c->c2.tls_exit_signal =SIGUSR1 ; } -#endif }#ifdef ENABLE_PLUGIN @@ -4369,7 +4321,6 @@ inherit_context_child(struct context *dest,/* c1 init */ packet_id_persist_init (&dest->c1.pid_persist); -#ifdef ENABLE_CRYPTO dest->c1.ks.key_type = src->c1.ks.key_type;/* inherit SSL context */ dest->c1.ks.ssl_ctx = src->c1.ks.ssl_ctx;@@ -4379,7 +4330,6 @@ inherit_context_child(struct context *dest, dest->c1.ciphername = src->c1.ciphername; dest->c1.authname = src->c1.authname; dest->c1.keysize = src->c1.keysize; -#endif /* options */ dest->options = src->options;@@ -4453,9 +4403,7 @@ inherit_context_top(struct context *dest,/* detach plugins */ dest->plugins_owned = false; -#ifdef ENABLE_CRYPTO dest->c2.tls_multi =NULL ; -#endif /* detach c1 ownership */ dest->c1.tuntap_owned = false;@@ -4513,8 +4461,6 @@ close_context(struct context *c, int sig, unsigned int flags) } } -#ifdef ENABLE_CRYPTO -/* * Do a loopback test * on the crypto subsystem. @@ -4542,12 +4488,9 @@ test_crypto_thread(void *arg)return NULL ; } -#endif /* ENABLE_CRYPTO */ -bool do_test_crypto (const struct options *o) { -#ifdef ENABLE_CRYPTO if (o->test_crypto) {struct context c;@@ -4562,6 +4505,5 @@ do_test_crypto(const struct options *o)test_crypto_thread ((void *) &c);return true; } -#endif return false; }src/openvpn/manage.c +1
-4@@ -762,10 +762,8 @@ man_query_need_str(struct management *man, const char *type, const char *action)static void man_forget_passwords (struct management *man) { -#ifdef ENABLE_CRYPTO ssl_purge_auth (false);msg (M_CLIENT ,"SUCCESS: Passwords were forgotten" ); -#endif } static void@@ -1918,12 +1916,11 @@ man_reset_client_socket(struct management *man, const bool exiting) }if (!exiting) { -#ifdef ENABLE_CRYPTO if (man->settings.flags &MF_FORGET_DISCONNECT ) {ssl_purge_auth (false); } -#endif +if (man->settings.flags &MF_SIGNAL ) {int mysig =man_mod_signal (man,SIGUSR1 );src/openvpn/misc.c +0
-13@@ -770,8 +770,6 @@ create_temp_file(const char *directory, const char *prefix, struct gc_arena *gc)return NULL ; } -#ifdef ENABLE_CRYPTO -/* * Prepend a random string to hostname to prevent DNS caching. * For example, foo.bar.gov would be modified to <random-chars>.foo.bar.gov. @@ -793,17 +791,6 @@ hostname_randomize(const char *hostname, struct gc_arena *gc)#undef n_rnd_bytes } -#else /* ifdef ENABLE_CRYPTO */ - -const char * -hostname_randomize (const char *hostname,struct gc_arena *gc) -{ -msg (M_WARN ,"WARNING: hostname randomization disabled when crypto support is not compiled" ); -return hostname; -} - -#endif /* ifdef ENABLE_CRYPTO */ -/* * Put a directory and filename together. */ src/openvpn/misc.h +1
-6@@ -143,13 +143,8 @@ const char **make_arg_array(const char *first, const char *parms, struct gc_arenconst char **make_extended_arg_array (char **p,struct gc_arena *gc);/* an analogue to the random() function, but use OpenSSL functions if available */ -#ifdef ENABLE_CRYPTO long int get_random (void ); -#else -#define get_random random -#endif -/* return true if filename can be opened for read */ bool test_file (const char *filename);@@ -162,7 +157,7 @@ const char *gen_path(const char *directory, const char *filename, struct gc_aren/* return true if pathname is absolute */ bool absolute_pathname (const char *pathname); -/* prepend a random prefix to hostname (need ENABLE_CRYPTO) */ +/* prepend a random prefix to hostname */ const char *hostname_randomize (const char *hostname,struct gc_arena *gc);/* src/openvpn/openvpn.h +0
-24@@ -54,7 +54,6 @@struct key_schedule { -#ifdef ENABLE_CRYPTO /* which cipher, HMAC digest, and key sizes are we using? */ struct key_type key_type;@@ -67,9 +66,6 @@ struct key_schedule/* optional TLS control channel wrapping */ struct key_type tls_auth_key_type;struct key_ctx_bi tls_wrap_key; -#else /* ENABLE_CRYPTO */ -int dummy; -#endif /* ENABLE_CRYPTO */ };/* @@ -96,10 +92,8 @@ struct context_buffersstruct buffer aux_buf;/* workspace buffers used by crypto routines */ -#ifdef ENABLE_CRYPTO struct buffer encrypt_buf;struct buffer decrypt_buf; -#endif /* workspace buffers for compression */ #ifdef USE_COMP @@ -334,8 +328,6 @@ struct context_2int occ_mtu_load_n_tries;#endif -#ifdef ENABLE_CRYPTO -/* * TLS-mode crypto objects. */ @@ -367,8 +359,6 @@ struct context_2struct event_timeout packet_id_persist_interval; -#endif /* ENABLE_CRYPTO */ -#ifdef USE_COMP struct compress_context *comp_context;/**< Compression context used by the @@ -566,7 +556,6 @@ struct context* have been compiled in. */ -#ifdef ENABLE_CRYPTO #define TLS_MODE (c) ((c)->c2.tls_multi != NULL)#define PROTO_DUMP_FLAGS (check_debug_level(D_LINK_RW_VERBOSE) ? (PD_SHOW_DATA|PD_VERBOSE) : 0)#define PROTO_DUMP (buf, gc) protocol_dump((buf), \@@ -574,22 +563,9 @@ struct context |(c->c2.tls_multi ? PD_TLS : 0) \ |(c->options.tls_auth_file ? c->c1.ks.key_type.hmac_length : 0), \ gc) -#else /* ifdef ENABLE_CRYPTO */ -#define TLS_MODE (c) (false) -#define PROTO_DUMP (buf, gc) format_hex(BPTR(buf), BLEN(buf), 80, gc) -#endif - -#ifdef ENABLE_CRYPTO #define MD5SUM (buf, len, gc) md5sum((buf), (len), 0, (gc)) -#else -#define MD5SUM (buf, len, gc) "[unavailable]" -#endif -#ifdef ENABLE_CRYPTO #define CIPHER_ENABLED (c) (c->c1.ks.key_type.cipher != NULL) -#else -#define CIPHER_ENABLED (c) (false) -#endif /* this represents "disabled peer-id" */ #define MAX_PEER_ID 0xFFFFFFsrc/openvpn/options.c +5
-50@@ -67,7 +67,6 @@ const char title_string[] = " [git:" CONFIGURE_GIT_REVISION CONFIGURE_GIT_FLAGS "]"#endif " " TARGET_ALIAS -#ifdef ENABLE_CRYPTO #if defined(ENABLE_CRYPTO_MBEDTLS ) " [SSL (mbed TLS)]"#elif defined(ENABLE_CRYPTO_OPENSSL )@@ -75,7 +74,6 @@ const char title_string[] =#else " [SSL]"#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ -#endif /* ENABLE_CRYPTO */ #ifdef USE_COMP #ifdef ENABLE_LZO " [LZO]" @@ -518,7 +516,6 @@ static const char usage_message[] ="--explicit-exit-notify [n] : On exit/restart, send exit signal to\n" " server/remote. n = # of retries, default=1.\n"#endif -#ifdef ENABLE_CRYPTO "\n" "Data Channel Encryption Options (must be compatible between peers):\n" "(These options are meaningful for both Static Key & TLS-mode)\n" @@ -748,7 +745,6 @@ static const char usage_message[] ="--genkey : Generate a random key to be used as a shared secret,\n" " for use with the --secret option.\n" "--secret file : Write key to file.\n" -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_FEATURE_TUN_PERSIST"\n" "Tun/tap config mode (available with linux 2.4+):\n" @@ -852,7 +848,6 @@ init_options(struct options *o, const bool init_gc)#if P2MP o->scheduled_exit_interval =5 ;#endif -#ifdef ENABLE_CRYPTO o->ciphername ="BF-CBC" ;#ifdef HAVE_AEAD_CIPHER_MODES /* IV_NCP=2 requires GCM support */ o->ncp_enabled = true;@@ -882,7 +877,6 @@ init_options(struct options *o, const bool init_gc)#ifdef ENABLE_X509ALTUSERNAME o->x509_username_field =X509_USERNAME_FIELD_DEFAULT ;#endif -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 o->pkcs11_pin_cache_period =-1 ;#endif /* ENABLE_PKCS11 */ @@ -1146,7 +1140,6 @@ string_substitute(const char *src, int from, int to, struct gc_arena *gc)return ret; } -#ifdef ENABLE_CRYPTO static uint8_t *parse_hash_fingerprint (const char *str,int nbytes,int msglevel,struct gc_arena *gc) {@@ -1188,7 +1181,6 @@ parse_hash_fingerprint(const char *str, int nbytes, int msglevel, struct gc_aren }return ret; } -#endif /* ifdef ENABLE_CRYPTO */ #ifdef _WIN32@@ -1560,14 +1552,12 @@ show_settings(const struct options *o)SHOW_INT (persist_mode);#endif -#ifdef ENABLE_CRYPTO SHOW_BOOL (show_ciphers);SHOW_BOOL (show_digests);SHOW_BOOL (show_engines);SHOW_BOOL (genkey);SHOW_STR (key_pass_file);SHOW_BOOL (show_tls_ciphers); -#endif SHOW_INT (connect_retry_max);show_connection_entries (o);@@ -1702,7 +1692,6 @@ show_settings(const struct options *o) }#endif -#ifdef ENABLE_CRYPTO SHOW_STR (shared_secret_file);SHOW_INT (key_direction);SHOW_STR (ciphername);@@ -1790,7 +1779,6 @@ show_settings(const struct options *o)SHOW_STR (tls_auth_file);SHOW_STR (tls_crypt_file); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 {@@ -2024,14 +2012,14 @@ options_postprocess_verify_ce(const struct options *options, const struct connecinit_options (&defaults, true); -#ifdef ENABLE_CRYPTO if (options->test_crypto) {notnull (options->shared_secret_file,"key file (--secret)" ); }else -#endif -notnull (options->dev,"TUN/TAP device (--dev)" ); + { +notnull (options->dev,"TUN/TAP device (--dev)" ); + }/* * Get tun/tap/null device type @@ -2072,10 +2060,7 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }if (options->inetd ==INETD_NOWAIT -#ifdef ENABLE_CRYPTO - && !(options->tls_server || options->tls_client) -#endif - ) + && !(options->tls_server || options->tls_client)) {msg (M_USAGE ,"--inetd nowait can only be used in TLS mode" ); }@@ -2485,8 +2470,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec }#endif /* P2MP_SERVER */ -#ifdef ENABLE_CRYPTO -if (options->ncp_enabled && !tls_check_ncp_cipher_list (options->ncp_ciphers)) {msg (M_USAGE ,"NCP cipher list contains unsupported ciphers." );@@ -2771,7 +2754,6 @@ options_postprocess_verify_ce(const struct options *options, const struct connec } }#undef MUST_BE_UNDEF -#endif /* ENABLE_CRYPTO */ #if P2MP if (options->auth_user_pass_file && !options->pull)@@ -3009,7 +2991,6 @@ options_postprocess_mutate(struct options *o)options_postprocess_mutate_ce (o, o->connection_list->array[i]); } -#ifdef ENABLE_CRYPTO if (o->tls_server) {/* Check that DH file is specified, or explicitly disabled */ @@ -3035,7 +3016,6 @@ options_postprocess_mutate(struct options *o) "in P2MP client or server mode" ); o->ncp_enabled = false; } -#endif #if ENABLE_MANAGEMENT if (o->http_proxy_override)@@ -3267,7 +3247,6 @@ options_postprocess_filechecks(struct options *options) {bool errs = false; -#ifdef ENABLE_CRYPTO /* ** SSL/TLS/crypto related files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" );@@ -3308,7 +3287,6 @@ options_postprocess_filechecks(struct options *options)/* ** Password files ** */ errs |=check_file_access (CHKACC_FILE |CHKACC_ACPTSTDIN |CHKACC_PRIVATE , options->key_pass_file,R_OK ,"--askpass" ); -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_MANAGEMENT errs |= check_file_access(CHKACC_FILE|CHKACC_ACPTSTDIN|CHKACC_PRIVATE, options->management_user_pass, R_OK,@@ -3331,10 +3309,8 @@ options_postprocess_filechecks(struct options *options) R_OK|W_OK, "--status");/* ** Config related ** */ -#ifdef ENABLE_CRYPTO errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" ); -#endif /* ENABLE_CRYPTO */ #if P2MP_SERVER errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" );@@ -3462,7 +3438,7 @@ static size_t calc_options_string_link_mtu(const struct options *o, const struct frame *frame) { size_t link_mtu = EXPANDED_SIZE(frame); -#ifdef ENABLE_CRYPTO +if (o->pull || o->mode ==MODE_SERVER ) {struct frame fake_frame = *frame;@@ -3478,7 +3454,6 @@ calc_options_string_link_mtu(const struct options *o, const struct frame *frame) EXPANDED_SIZE(&fake_frame)); link_mtu =EXPANDED_SIZE (&fake_frame); } -#endif return link_mtu; }@@ -3606,8 +3581,6 @@ options_string(const struct options *o, }#endif -#ifdef ENABLE_CRYPTO -#define TLS_CLIENT (o->tls_client)#define TLS_SERVER (o->tls_server)@@ -3705,8 +3678,6 @@ options_string(const struct options *o,#undef TLS_CLIENT#undef TLS_SERVER -#endif /* ENABLE_CRYPTO */ -return BSTR (&out); }@@ -4084,7 +4055,6 @@ usage(void)struct options o;init_options (&o, true); -#ifdef ENABLE_CRYPTO fprintf(fp, usage_message, title_string, o.ce.connect_retry_seconds,@@ -4096,15 +4066,6 @@ usage(void) o.replay_window, o.replay_time, o.tls_timeout, o.renegotiate_seconds, o.handshake_window, o.transition_window); -#else /* ifdef ENABLE_CRYPTO */ -fprintf (fp, usage_message, - title_string, - o.ce.connect_retry_seconds, - o.ce.connect_retry_seconds_max, - o.ce.local_port, o.ce.remote_port, -TUN_MTU_DEFAULT ,TAP_MTU_EXTRA_DEFAULT , - o.verbosity); -#endif fflush (fp);#endif /* ENABLE_SMALL */ @@ -4132,11 +4093,7 @@ show_windows_version(const unsigned int flags)void show_library_versions (const unsigned int flags) { -#ifdef ENABLE_CRYPTO #define SSL_LIB_VER_STR get_ssl_library_version() -#else -#define SSL_LIB_VER_STR "" -#endif #ifdef ENABLE_LZO #define LZO_LIB_VER_STR ", LZO ", lzo_version_string()#else @@ -7441,7 +7398,6 @@ add_option(struct options *options, } }#endif /* USE_COMP */ -#ifdef ENABLE_CRYPTO else if (streq(p[0], "show-ciphers") && !p[1]) {VERIFY_PERMISSION (OPT_P_GENERAL );@@ -8124,7 +8080,6 @@ add_option(struct options *options, options->x509_username_field = p[1 ]; }#endif /* ENABLE_X509ALTUSERNAME */ -#endif /* ENABLE_CRYPTO */ #ifdef ENABLE_PKCS11 else if (streq(p[0], "show-pkcs11-ids") && !p[3]) {src/openvpn/options.h +1
-8@@ -41,9 +41,7 @@#include "comp.h" #include "pushlist.h" #include "clinat.h" -#ifdef ENABLE_CRYPTO #include "crypto_backend.h" -#endif /* @@ -81,7 +79,7 @@ struct options_pre_pull };#endif -#if defined(ENABLE_CRYPTO ) && !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS ) +#if !defined(ENABLE_CRYPTO_OPENSSL ) && !defined(ENABLE_CRYPTO_MBEDTLS )#error "At least one of OpenSSL or mbed TLS needs to be defined."#endif @@ -188,7 +186,6 @@ struct optionsbool persist_config;int persist_mode; -#ifdef ENABLE_CRYPTO const char *key_pass_file;bool show_ciphers;bool show_digests;@@ -196,7 +193,6 @@ struct optionsbool show_tls_ciphers;bool show_curves;bool genkey; -#endif /* Networking parms */ int connect_retry_max;@@ -468,7 +464,6 @@ struct options#endif #endif /* if P2MP */ -#ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file;const char *shared_secret_file_inline;@@ -580,8 +575,6 @@ struct optionsbool tls_exit; -#endif /* ENABLE_CRYPTO */ -const struct x509_track *x509_track;/* special state parms */ src/openvpn/packet_id.c +0
-4@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "packet_id.h" #include "misc.h" #include "integer.h" @@ -695,5 +693,3 @@ packet_id_interactive_test(void) packet_id_free(&pid); }#endif /* ifdef PID_TEST */ - -#endif /* ENABLE_CRYPTO */ src/openvpn/packet_id.h +0
-3@@ -27,8 +27,6 @@* attempts to replay them back later. */ -#ifdef ENABLE_CRYPTO -#ifndef PACKET_ID_H #define PACKET_ID_H @@ -342,4 +340,3 @@ packet_id_reap_test(struct packet_id_rec *p) }#endif /* PACKET_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/plugin.c +6
-17@@ -517,11 +517,9 @@ plugin_call_item(const struct plugin *p,const int type, const struct argv *av, struct openvpn_plugin_string_list **retlist, - const char **envp -#ifdef ENABLE_CRYPTO - , int certdepth, + const char **envp, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { int status = OPENVPN_PLUGIN_FUNC_SUCCESS;@@ -550,13 +548,8 @@ plugin_call_item(const struct plugin *p, (const char **const ) envp, p->plugin_handle, per_client_context, -#ifdef ENABLE_CRYPTO (current_cert ? certdepth :-1 ), current_cert -#else --1 , -NULL -#endif };struct openvpn_plugin_args_func_return retargs;@@ -786,11 +779,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int certdepth, + struct env_set *es, + int certdepth, openvpn_x509_cert_t *current_cert -#endif ) { if (pr)@@ -818,11 +809,9 @@ plugin_call_ssl(const struct plugin_list *pl, type, av, pr ? &pr->list[i] :NULL , - envp -#ifdef ENABLE_CRYPTO - ,certdepth, + envp, + certdepth, current_cert -#endif );switch (status) {src/openvpn/plugin.h +5
-13@@ -127,11 +127,9 @@ int plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif );void plugin_list_close (struct plugin_list *pl);@@ -189,11 +187,9 @@ plugin_call_ssl(const struct plugin_list *pl,const int type, const struct argv *av, struct plugin_return *pr, - struct env_set *es -#ifdef ENABLE_CRYPTO - , int current_cert_depth, + struct env_set *es, + int current_cert_depth, openvpn_x509_cert_t *current_cert -#endif ) { return 0;@@ -208,11 +204,7 @@ plugin_call(const struct plugin_list *pl,struct plugin_return *pr, struct env_set *es) { - return plugin_call_ssl(pl, type, av, pr, es -#ifdef ENABLE_CRYPTO - , -1, NULL -#endif - ); + return plugin_call_ssl(pl, type, av, pr, es, -1, NULL); }#endif /* OPENVPN_PLUGIN_H */ src/openvpn/reliable.c +0
-9@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "error.h" #include "common.h" @@ -802,10 +800,3 @@ reliable_debug_print(const struct reliable *rel, char *desc) }#endif /* if 0 */ - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/reliable.h +0
-3@@ -28,8 +28,6 @@*/ -#ifdef ENABLE_CRYPTO -#ifndef RELIABLE_H #define RELIABLE_H @@ -476,4 +474,3 @@ void reliable_ack_debug_print(const struct reliable_ack *ack, char *desc);#endif /* RELIABLE_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.c +0
-9@@ -38,8 +38,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "error.h" #include "common.h" #include "crypto.h" @@ -60,10 +58,3 @@ session_id_print(const struct session_id *sid, struct gc_arena *gc) {return format_hex (sid->id,SID_SIZE ,0 , gc); } - -#else /* ifdef ENABLE_CRYPTO */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/session_id.h +0
-3@@ -29,8 +29,6 @@* negotiated). */ -#ifdef ENABLE_CRYPTO -#ifndef SESSION_ID_H #define SESSION_ID_H @@ -82,4 +80,3 @@ void session_id_random(struct session_id *sid);const char *session_id_print (const struct session_id *sid,struct gc_arena *gc);#endif /* SESSION_ID_H */ -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.c +0
-9@@ -43,8 +43,6 @@#include "syshead.h" #include "win32.h" -#if defined(ENABLE_CRYPTO ) -#include "error.h" #include "common.h" #include "socket.h" @@ -4245,10 +4243,3 @@ delayed_auth_pass_purge(void) auth_user_pass.wait_for_push = false;purge_user_pass (&auth_user_pass, false); } - -#else /* if defined(ENABLE_CRYPTO) */ -static void -dummy (void ) -{ -} -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl.h +0
-4@@ -29,8 +29,6 @@#ifndef OPENVPN_SSL_H #define OPENVPN_SSL_H -#if defined(ENABLE_CRYPTO ) -#include "basic.h" #include "common.h" #include "crypto.h" @@ -600,6 +598,4 @@ bool is_hard_reset(int op, int key_method);void delayed_auth_pass_purge (void ); -#endif /* ENABLE_CRYPTO */ -#endif /* ifndef OPENVPN_SSL_H */ src/openvpn/ssl_backend.h +0
-3@@ -124,8 +124,6 @@ int tls_version_parse(const char *vstr, const char *extra);*/ int tls_version_max (void ); -#ifdef ENABLE_CRYPTO -/** * Initialise a library-specific TLS context for a server. * @@ -539,5 +537,4 @@ void get_highest_preference_tls_cipher(char *buf, int size);*/ const char *get_ssl_library_version (void ); -#endif /* ENABLE_CRYPTO */ #endif /* SSL_BACKEND_H_ */ src/openvpn/ssl_mbedtls.c +2
-2@@ -35,7 +35,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "errlevel.h" #include "ssl_backend.h" @@ -1395,4 +1395,4 @@ get_ssl_library_version(void) return mbedtls_version; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "errlevel.h" #include "buffer.h" @@ -1874,4 +1874,4 @@ get_ssl_library_version(void) return SSLeay_version(SSLEAY_VERSION); } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/ssl_verify.c +0
-4@@ -34,8 +34,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO -#include "misc.h" #include "manage.h" #include "otime.h" @@ -1541,5 +1539,3 @@ tls_x509_clear_env(struct env_set *es) item = next; } } - -#endif /* ENABLE_CRYPTO */ src/openvpn/ssl_verify.h +0
-4@@ -29,8 +29,6 @@#ifndef SSL_VERIFY_H_ #define SSL_VERIFY_H_ -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include "misc.h" #include "ssl_common.h" @@ -243,6 +241,4 @@ tls_client_reason(struct tls_multi *multi)/** Remove any X509_ env variables from env_set es */ void tls_x509_clear_env (struct env_set *es); -#endif /* ENABLE_CRYPTO */ -#endif /* SSL_VERIFY_H_ */ src/openvpn/ssl_verify_mbedtls.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_MBEDTLS ) +#if defined(ENABLE_CRYPTO_MBEDTLS )#include "crypto_mbedtls.h" #include "ssl_verify.h" @@ -550,4 +550,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return false; } -#endif /* #if defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_MBEDTLS) */ +#endif /* #if defined(ENABLE_CRYPTO_MBEDTLS) */ src/openvpn/ssl_verify_openssl.c +2
-2@@ -34,7 +34,7 @@#include "syshead.h" -#if defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(ENABLE_CRYPTO_OPENSSL )#include "ssl_verify_openssl.h" @@ -800,4 +800,4 @@ tls_verify_crl_missing(const struct tls_options *opt) return true; } -#endif /* defined(ENABLE_CRYPTO) && defined(ENABLE_CRYPTO_OPENSSL) */ +#endif /* defined(ENABLE_CRYPTO_OPENSSL) */ src/openvpn/syshead.h +3
-13@@ -513,7 +513,7 @@ socket_defined(const socket_descriptor_t sd)* Do we have point-to-multipoint capability? */ -#if defined(ENABLE_CRYPTO ) && defined(HAVE_GETTIMEOFDAY_NANOSECONDS ) +#if defined(HAVE_GETTIMEOFDAY_NANOSECONDS )#define P2MP 1#else #define P2MP 0@@ -550,7 +550,7 @@ socket_defined(const socket_descriptor_t sd)/* * Enable external private key */ -#if defined(ENABLE_MANAGEMENT ) && defined(ENABLE_CRYPTO ) +#if defined(ENABLE_MANAGEMENT )#define MANAGMENT_EXTERNAL_KEY #endif @@ -597,25 +597,17 @@ socket_defined(const socket_descriptor_t sd)/* * Should we include NTLM proxy functionality */ -#if defined(ENABLE_CRYPTO )#define NTLM 1 -#else -#define NTLM 0 -#endif /* * Should we include proxy digest auth functionality */ -#if defined(ENABLE_CRYPTO )#define PROXY_DIGEST_AUTH 1 -#else -#define PROXY_DIGEST_AUTH 0 -#endif /* * Do we have CryptoAPI capability? */ -#if defined(_WIN32) && defined(ENABLE_CRYPTO ) && defined(ENABLE_CRYPTO_OPENSSL ) +#if defined(_WIN32) && defined(ENABLE_CRYPTO_OPENSSL )#define ENABLE_CRYPTOAPI #endif @@ -684,9 +676,7 @@ socket_defined(const socket_descriptor_t sd)/* * Do we support pushing peer info? */ -#if defined(ENABLE_CRYPTO )#define ENABLE_PUSH_PEER_INFO -#endif /* * Compression support src/openvpn/tls_crypt.c +0
-3@@ -29,7 +29,6 @@#include "syshead.h" -#ifdef ENABLE_CRYPTO #include "crypto.h" #include "session_id.h" @@ -265,5 +264,3 @@ error_exit:gc_free (&gc);return false; } - -#endif /* EMABLE_CRYPTO */ src/openvpn/tls_crypt.h +0
-4@@ -74,8 +74,6 @@#ifndef TLSCRYPT_H #define TLSCRYPT_H -#ifdef ENABLE_CRYPTO -#include "buffer.h" #include "crypto.h" #include "session_id.h" @@ -142,6 +140,4 @@ bool tls_crypt_unwrap(const struct buffer *src, struct buffer *dst,/** @} */ -#endif /* ENABLE_CRYPTO */ -#endif /* TLSCRYPT_H */ tests/unit_tests/openvpn/Makefile.am +0
-2@@ -6,9 +6,7 @@ if HAVE_LD_WRAP_SUPPORT check_PROGRAMS += argv_testdriver buffer_testdriver endif -if ENABLE_CRYPTO check_PROGRAMS += packet_id_testdriver tls_crypt_testdriver -endif TESTS = $(check_PROGRAMS)tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -27,8 +27,6 @@#include "config-msvc.h" #endif -#ifdef ENABLE_CRYPTO -#include "syshead.h" #include <stdio.h>
tests/unit_tests/openvpn/test_tls_crypt.c main(void) { · line 272
Quoted 5 lines
tests/unit_tests/openvpn/test_tls_crypt.c +0
-2@@ -268,5 +266,3 @@ main(void) {return ret; } - -#endif /* ENABLE_CRYPTO */
Looks good now!
-Steffan
[Openvpn-devel] [PATCH applied] Re: Remove ENABLE_CRYPTO
In reply to Antonio QuartulliI've done a quick review and the changes make sense. Tested with local t_client tests on Linux and FreeBSD (unsurprisingly, no suprises).
Since this series is refactoring (though mostly not very intrusive), "master only" rule applies.
Your patch has been applied to the master branch.
commit c7ca91332d330b3cbbc2a8faef4f3a3ae70048c5
Author: Antonio Quartulli Date: Mon Dec 4 09:01:10 2017 +0800
Remove ENABLE_CRYPTO
Signed-off-by: Antonio Quartulli <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg16004.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering