ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-02-06 18:59:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

condensed some TLS overrides and removed extra includes

Browse Source
This commit is contained in:
Bryan Stansell 2018-05-27 18:56:25 -07:00
parent 16598183c6
commit d6af8728d7
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conserver/cutil.h
View File

@ -10,6 +10,12 @@
#if HAVE_OPENSSL #if HAVE_OPENSSL
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/err.h> # include <openssl/err.h>
# if OPENSSL_VERSION_NUMBER < 0x10100000L
# define TLS_method SSLv23_method
# define CIPHER_SEC0
# else
# define CIPHER_SEC0 ":@SECLEVEL=0"
# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif #endif
#if HAVE_GSSAPI #if HAVE_GSSAPI
# include <gssapi/gssapi.h> # include <gssapi/gssapi.h>

4
conserver/main.c
View File

@ -115,10 +115,6 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
return 1; return 1;
} }
#define TLS_method SSLv23_method
#define CIPHER_SEC0
#else
#define CIPHER_SEC0 ":@SECLEVEL=0"
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
SSL_CTX *ctx = (SSL_CTX *)0; SSL_CTX *ctx = (SSL_CTX *)0;

11
console/console.c
View File

@ -36,8 +36,6 @@
#include <readconf.h> #include <readconf.h>
#include <version.h> #include <version.h>
#if HAVE_OPENSSL #if HAVE_OPENSSL
# include <openssl/ssl.h>
# include <openssl/err.h>
# include <openssl/opensslv.h> # include <openssl/opensslv.h>
#endif #endif
#if HAVE_GSSAPI #if HAVE_GSSAPI
@ -71,15 +69,6 @@ struct winsize ws;
#endif #endif
#if HAVE_OPENSSL #if HAVE_OPENSSL
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define TLS_method SSLv23_method
#define CIPHER_SEC0
#else
#define CIPHER_SEC0 ":@SECLEVEL=0"
#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
SSL_CTX *ctx = (SSL_CTX *)0; SSL_CTX *ctx = (SSL_CTX *)0;
void void