status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

compatibility with OpenSSL 1.1.x 

Use OpenSSL TLS_server_method() instead of TLSv1_server_method()
Also fix ERR_remove_state(0) call
This commit is contained in:
Thomas Bernard 2019-10-05 21:24:54 +02:00
parent 123e589266
commit 700b86eeda
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpd/Changelog.txt
View File

@ -1,4 +1,7 @@
$Id: Changelog.txt,v 1.454 2019/10/03 20:40:37 nanard Exp $ $Id: Changelog.txt,v 1.455 2019/10/05 18:05:10 nanard Exp $
2019/10/05:
Use OpenSSL TLS_server_method() instead of TLSv1_server_method()
2019/10/03: 2019/10/03:
Use OpenBSD pledge() Use OpenBSD pledge()

16
miniupnpd/upnphttp.c
View File

@ -1,9 +1,9 @@
/* $Id: upnphttp.c,v 1.107 2018/01/16 00:50:49 nanard Exp $ */ /* $Id: upnphttp.c,v 1.108 2019/10/05 18:05:13 nanard Exp $ */
/* vim: tabstop=4 shiftwidth=4 noexpandtab /* vim: tabstop=4 shiftwidth=4 noexpandtab
* Project : miniupnp * Project : miniupnp
* Website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * Website : http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* Author : Thomas Bernard * Author : Thomas Bernard
* Copyright (c) 2005-2018 Thomas Bernard * Copyright (c) 2005-2019 Thomas Bernard
* This software is subject to the conditions detailed in the * This software is subject to the conditions detailed in the
* LICENCE file included in this distribution. * LICENCE file included in this distribution.
* */ * */
@ -67,9 +67,17 @@ int init_ssl(void)
const SSL_METHOD *method; const SSL_METHOD *method;
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
#if OPENSSL_VERSION_NUMBER < 0x10100000L
method = TLSv1_server_method(); method = TLSv1_server_method();
#else
method = TLS_server_method();
#endif
if(method == NULL) { if(method == NULL) {
#if OPENSSL_VERSION_NUMBER < 0x10100000L
syslog(LOG_ERR, "TLSv1_server_method() failed"); syslog(LOG_ERR, "TLSv1_server_method() failed");
#else
syslog(LOG_ERR, "TLS_server_method() failed");
#endif
syslogsslerr(); syslogsslerr();
return -1; return -1;
} }
@ -111,7 +119,11 @@ void free_ssl(void)
SSL_CTX_free(ssl_ctx); SSL_CTX_free(ssl_ctx);
ssl_ctx = NULL; ssl_ctx = NULL;
} }
#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10100000L
ERR_remove_thread_state(NULL);
#elif OPENSSL_VERSION_NUMBER < 0x10000000L
ERR_remove_state(0); ERR_remove_state(0);
#endif
ENGINE_cleanup(); ENGINE_cleanup();
CONF_modules_unload(1); CONF_modules_unload(1);
ERR_free_strings(); ERR_free_strings();