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

miniupnpd: free OpenSSL memory

This commit is contained in:
Thomas Bernard 2014-04-09 16:09:31 +02:00
parent e91bda48d7
commit e26174d05d
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
miniupnpd/miniupnpd.c
View File

@ -1,4 +1,4 @@
/* $Id: miniupnpd.c,v 1.192 2014/04/09 11:07:36 nanard Exp $ */ /* $Id: miniupnpd.c,v 1.193 2014/04/09 14:08:11 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2014 Thomas Bernard * (c) 2006-2014 Thomas Bernard
@ -2324,6 +2324,9 @@ shutdown:
free(lan_addr); free(lan_addr);
} }
#ifdef ENABLE_HTTPS
free_ssl();
#endif
#ifdef ENABLE_NATPMP #ifdef ENABLE_NATPMP
free(snatpmp); free(snatpmp);
#endif #endif

19
miniupnpd/upnphttp.c
View File

@ -1,4 +1,4 @@
/* $Id: upnphttp.c,v 1.90 2014/04/09 13:15:43 nanard Exp $ */ /* $Id: upnphttp.c,v 1.91 2014/04/09 14:08:12 nanard Exp $ */
/* 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
@ -31,6 +31,8 @@
#ifdef ENABLE_HTTPS #ifdef ENABLE_HTTPS
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/engine.h>
#include <openssl/conf.h>
static SSL_CTX *ssl_ctx = NULL; static SSL_CTX *ssl_ctx = NULL;
#ifndef HTTPS_CERTFILE #ifndef HTTPS_CERTFILE
@ -87,6 +89,21 @@ int init_ssl(void)
} }
return 0; return 0;
} }
void free_ssl(void)
{
/* free context */
if(ssl_ctx != NULL) {
SSL_CTX_free(ssl_ctx);
ssl_ctx = NULL;
}
ERR_remove_state(0);
ENGINE_cleanup();
CONF_modules_unload(1);
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
}
#endif /* ENABLE_HTTPS */ #endif /* ENABLE_HTTPS */
struct upnphttp * struct upnphttp *

3
miniupnpd/upnphttp.h
View File

@ -1,4 +1,4 @@
/* $Id: upnphttp.h,v 1.37 2014/04/09 13:15:45 nanard Exp $ */ /* $Id: upnphttp.h,v 1.38 2014/04/09 14:08:13 nanard Exp $ */
/* MiniUPnP project /* MiniUPnP project
* http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
* (c) 2006-2014 Thomas Bernard * (c) 2006-2014 Thomas Bernard
@ -110,6 +110,7 @@ struct upnphttp {
#ifdef ENABLE_HTTPS #ifdef ENABLE_HTTPS
int init_ssl(void); int init_ssl(void);
void free_ssl(void);
#endif /* ENABLE_HTTPS */ #endif /* ENABLE_HTTPS */
/* New_upnphttp() */ /* New_upnphttp() */