Merge pull request #9 from blinkingtwelve/master

Allow TLS in addition to SSL3
This commit is contained in:
Dag Wieers 2015-07-04 14:31:45 +02:00
commit 1050238587
2 changed files with 3 additions and 3 deletions

View file

@ -46,9 +46,9 @@ OPTFLAGS += -DSO_REUSEPORT
# END system dependant block
SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
ifeq ($(SSL_LIBS),)
SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null)
ifeq ($(SSL_LIBS),)
SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null)
endif
ifeq ($(SSL_LIBS),)
SSL_LIBS := -lssl -lcrypto

View file

@ -151,7 +151,7 @@ int stream_enable_ssl(PTSTREAM *pts) {
/* Initialise the connection */
SSLeay_add_ssl_algorithms();
meth = SSLv3_client_method();
meth = SSLv23_client_method();
SSL_load_error_strings();
ctx = SSL_CTX_new (meth);