From 1f30c8943bf2ca3a26c362fa7b2487860f86521b Mon Sep 17 00:00:00 2001 From: Aaron Jones Date: Thu, 15 Sep 2016 14:08:19 +0000 Subject: [PATCH] OpenSSL: Tidy up headers Move all the header includes to a single header file, rename said file. --- libratbox/src/openssl.c | 77 ++----------------------- libratbox/src/openssl_ratbox.h | 102 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 71 deletions(-) create mode 100644 libratbox/src/openssl_ratbox.h diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c index 64a446b0..0871c671 100644 --- a/libratbox/src/openssl.c +++ b/libratbox/src/openssl.c @@ -1,9 +1,10 @@ /* * libratbox: a library used by ircd-ratbox and other things - * openssl.c: openssl related code + * openssl.c: OpenSSL backend * * Copyright (C) 2007-2008 ircd-ratbox development team * Copyright (C) 2007-2008 Aaron Sethman + * Copyright (C) 2015-2016 Aaron Jones * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA * - * $Id: commio.c 24808 2008-01-02 08:17:05Z androsyn $ */ #include @@ -30,67 +30,8 @@ #include #include -#include -#include -#include -#include -#include -#include -/* - * This is a mess but what can you do when the library authors - * refuse to play ball with established conventions? - */ -#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x20020002L) -# define LRB_HAVE_TLS_METHOD_API 1 -#else -# if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -# define LRB_HAVE_TLS_METHOD_API 1 -# endif -#endif - -/* - * Use SSL_CTX_set_ecdh_auto() in OpenSSL 1.0.2 only - * Use SSL_CTX_set1_curves_list() in OpenSSL 1.0.2 and above - * TODO: Merge this into the block above if LibreSSL implements them - */ -#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10002000L) -# define LRB_HAVE_TLS_SET_CURVES 1 -# if (OPENSSL_VERSION_NUMBER < 0x10100000L) -# define LRB_HAVE_TLS_ECDH_AUTO 1 -# endif -#endif - -/* - * More LibreSSL compatibility mess - * Used in rb_get_ssl_info() below. - */ -#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) - /* OpenSSL 1.1.0+ */ -# define LRB_SSL_VTEXT_COMPILETIME OPENSSL_VERSION_TEXT -# define LRB_SSL_VTEXT_RUNTIME OpenSSL_version(OPENSSL_VERSION) -# define LRB_SSL_VNUM_COMPILETIME OPENSSL_VERSION_NUMBER -# define LRB_SSL_VNUM_RUNTIME OpenSSL_version_num() -# define LRB_SSL_FULL_VERSION_INFO 1 -#else -/* - * "Full version info" above means we have access to all 4 pieces of information. - * - * For the below, this is not the case; LibreSSL version number at runtime returns - * the wrong version number, and OpenSSL version text at compile time does not exist. - * Thus, we only reliably have version text at runtime, and version number at compile - * time. - */ -# if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x20200000L) - /* LibreSSL 2.2.0+ */ -# define LRB_SSL_VTEXT_RUNTIME SSLeay_version(SSLEAY_VERSION) -# define LRB_SSL_VNUM_COMPILETIME LIBRESSL_VERSION_NUMBER -# else - /* OpenSSL < 1.1.0 or LibreSSL < 2.2.0 */ -# define LRB_SSL_VTEXT_RUNTIME SSLeay_version(SSLEAY_VERSION) -# define LRB_SSL_VNUM_COMPILETIME SSLEAY_VERSION_NUMBER -# endif -#endif +#include "openssl_ratbox.h" static SSL_CTX *ssl_server_ctx = NULL; static SSL_CTX *ssl_client_ctx = NULL; @@ -374,15 +315,9 @@ rb_init_ssl(void) int rb_setup_ssl_server(const char *cert, const char *keyfile, const char *dhfile, const char *cipher_list) { - const char libratbox_ciphers[] = "kEECDH+HIGH:kEDH+HIGH:HIGH:!aNULL"; - SSL_CTX *ssl_server_ctx_new; SSL_CTX *ssl_client_ctx_new; - #ifdef LRB_HAVE_TLS_SET_CURVES - const char libratbox_curves[] = "P-521:P-384:P-256"; - #endif - if(cert == NULL) { rb_lib_log("rb_setup_ssl_server: No certificate file"); @@ -396,7 +331,7 @@ rb_setup_ssl_server(const char *cert, const char *keyfile, const char *dhfile, c } if(cipher_list == NULL) - cipher_list = libratbox_ciphers; + cipher_list = rb_default_ciphers; #ifdef LRB_HAVE_TLS_METHOD_API if((ssl_server_ctx_new = SSL_CTX_new(TLS_server_method())) == NULL) @@ -449,8 +384,8 @@ rb_setup_ssl_server(const char *cert, const char *keyfile, const char *dhfile, c #endif #ifdef LRB_HAVE_TLS_SET_CURVES - SSL_CTX_set1_curves_list(ssl_server_ctx_new, libratbox_curves); - SSL_CTX_set1_curves_list(ssl_client_ctx_new, libratbox_curves); + SSL_CTX_set1_curves_list(ssl_server_ctx_new, rb_default_curves); + SSL_CTX_set1_curves_list(ssl_client_ctx_new, rb_default_curves); #endif SSL_CTX_set_verify(ssl_server_ctx_new, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, verify_accept_all_cb); diff --git a/libratbox/src/openssl_ratbox.h b/libratbox/src/openssl_ratbox.h new file mode 100644 index 00000000..b2d033c9 --- /dev/null +++ b/libratbox/src/openssl_ratbox.h @@ -0,0 +1,102 @@ +/* + * libratbox: a library used by ircd-ratbox and other things + * openssl_ratbox.h: OpenSSL backend data + * + * Copyright (C) 2015-2016 Aaron Jones + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + */ + +#ifndef LRB_OPENSSL_H_INC +#define LRB_OPENSSL_H_INC 1 + +#include +#include +#include +#include +#include +#include + +#include + +/* + * A long time ago, in a world far away, OpenSSL had a well-established mechanism for ensuring compatibility with + * regards to added, changed, and removed functions, by having an SSLEAY_VERSION_NUMBER macro. This was then + * renamed to OPENSSL_VERSION_NUMBER, but the old macro was kept around for compatibility until OpenSSL version + * 1.1.0. + * + * Then the OpenBSD developers decided that having OpenSSL in their codebase was a bad idea. They forked it to + * create LibreSSL, gutted all of the functionality they didn't want or need, and generally improved the library + * a lot. Then, as the OpenBSD developers are want to do, they packaged up LibreSSL for release to other + * operating systems, as LibreSSL Portable. Think along the lines of OpenSSH where they have also done this. + * + * The fun part of this story ends there. LibreSSL has an OPENSSL_VERSION_NUMBER macro, but they have set it to a + * stupidly high value, version 2.0. OpenSSL version 2.0 does not exist, and LibreSSL 2.2 does not implement + * everything OpenSSL 1.0.2 or 1.1.0 do. This completely breaks the entire purpose of the macro. + * + * The ifdef soup below is for LibreSSL compatibility. Please find whoever thought setting OPENSSL_VERSION_NUMBER + * to a version that does not exist was a good idea. Encourage them to realise that it is not. -- amdj + */ + +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) +# define LRB_SSL_NO_EXPLICIT_INIT 1 +#endif + +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10002000L) +# define LRB_HAVE_TLS_SET_CURVES 1 +# if (OPENSSL_VERSION_NUMBER < 0x10100000L) +# define LRB_HAVE_TLS_ECDH_AUTO 1 +# endif +#endif + +#if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x20020002L) +# define LRB_HAVE_TLS_METHOD_API 1 +#else +# if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) +# define LRB_HAVE_TLS_METHOD_API 1 +# endif +#endif + +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) +# define LRB_SSL_VTEXT_COMPILETIME OPENSSL_VERSION_TEXT +# define LRB_SSL_VTEXT_RUNTIME OpenSSL_version(OPENSSL_VERSION) +# define LRB_SSL_VNUM_COMPILETIME OPENSSL_VERSION_NUMBER +# define LRB_SSL_VNUM_RUNTIME OpenSSL_version_num() +# define LRB_SSL_FULL_VERSION_INFO 1 +#else +# if defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER >= 0x20200000L) +# define LRB_SSL_VTEXT_RUNTIME SSLeay_version(SSLEAY_VERSION) +# define LRB_SSL_VNUM_COMPILETIME LIBRESSL_VERSION_NUMBER +# else +# define LRB_SSL_VTEXT_RUNTIME SSLeay_version(SSLEAY_VERSION) +# define LRB_SSL_VNUM_COMPILETIME SSLEAY_VERSION_NUMBER +# endif +#endif + + + +/* + * Default supported ciphersuites (if the user does not provide any) and curves (OpenSSL 1.0.2+) + * Hardcoded secp384r1 (P-384) is used on OpenSSL 1.0.0 and 1.0.1 (if available). + */ + +static const char rb_default_ciphers[] = "kEECDH+HIGH:kEDH+HIGH:HIGH:!aNULL"; +#ifdef LRB_HAVE_TLS_SET_CURVES +static const char rb_default_curves[] = "P-521:P-384:P-256"; +#endif + +#endif /* LRB_OPENSSL_H_INC */