From: Felix Morgner <felix.morgner@gmail.com>
Date: Tue, 22 Sep 2015 00:28:44 +0000 (-0700)
Subject: Merge branch 'master' of github.com:fmorgner/umurmur
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;ds=inline;h=8beca0ff3a7fad94d2e3a6134919dbb10bcb3b03;hp=-c;p=umurmur.git

Merge branch 'master' of github.com:fmorgner/umurmur
---

8beca0ff3a7fad94d2e3a6134919dbb10bcb3b03
diff --combined src/CMakeLists.txt
index 15473d3,48b244e..f89f008
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -14,14 -14,13 +14,15 @@@ set(SOURCE_FILE
    ${CMAKE_CURRENT_SOURCE_DIR}/timer.c
    ${CMAKE_CURRENT_SOURCE_DIR}/util.c
    ${CMAKE_CURRENT_SOURCE_DIR}/voicetarget.c
+   ${CMAKE_CURRENT_SOURCE_DIR}/memory.c
    )
  
  if(SSL MATCHES "openssl")
    list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_openssl.c)
  elseif(SSL MATCHES "polarssl")
    list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_polarssl.c)
 +elseif(SSL MATCHES "mbedtls")
 +  list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_mbedtls.c)
  elseif(SSL MATCHES "gnutls")
    list(APPEND SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/ssli_gnutls.c)
  endif(SSL MATCHES "openssl")
diff --combined src/Makefile.am
index 3b37ba8,b4bc3fd..e508d80
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -27,7 -27,7 +27,7 @@@
  #  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  bin_PROGRAMS=umurmurd
- umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c
+ umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c memory.c
  
  if USE_OPENSSL
  umurmurd_SOURCES+=ssli_openssl.c
@@@ -35,13 -35,9 +35,13 @@@ els
  if USE_GNUTLS
  umurmurd_SOURCES+=ssli_gnutls.c
  else
 +if USE_MBEDTLS
 +umurmurd_SOURCES+=ssli_mbedtls.c
 +else
  umurmurd_SOURCES+=ssli_polarssl.c
  endif
  endif
 +endif
  
  if USE_SHAREDMEMORY_API
  umurmurd_SOURCES+=sharedmemory.c
diff --combined src/ssli_openssl.c
index de081fa,ee839b8..bcd4d9e
--- a/src/ssli_openssl.c
+++ b/src/ssli_openssl.c
@@@ -33,6 -33,7 +33,7 @@@
  
  #include "conf.h"
  #include "log.h"
+ #include "memory.h"
  #include "ssl.h"
  
  /*
@@@ -158,7 -159,7 +159,7 @@@ static void SSL_initializeCert() 
  	char *key = (char *)getStrConf(KEY);
  
  	if (context) {
 -		bool did_load_cert = SSL_CTX_use_certificate_chain_file(context, crt);
 +		bool_t did_load_cert = SSL_CTX_use_certificate_chain_file(context, crt);
  		rsa = SSL_readprivatekey(key);
  
  		if (!rsa || !did_load_cert) {
@@@ -250,9 -251,7 +251,7 @@@ void SSLi_init(void
  			Log_debug("%s", SSL_CIPHER_get_name(cipher));
  			cipherstringlen += strlen(SSL_CIPHER_get_name(cipher)) + 1;
  		}
- 		cipherstring = malloc(cipherstringlen + 1);
- 		if (cipherstring == NULL)
- 			Log_fatal("Out of memory");
+ 		cipherstring = Memory_safeMalloc(1, cipherstringlen + 1);
  		for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) {
  			offset += sprintf(cipherstring + offset, "%s:", SSL_CIPHER_get_name(cipher));
  		}
@@@ -328,10 -327,7 +327,7 @@@ bool_t SSLi_getSHA1Hash(SSL_handle_t *s
  	}
  
  	len = i2d_X509(x509, NULL);
- 	buf = malloc(len);
- 	if (buf == NULL) {
- 		Log_fatal("malloc");
- 	}
+ 	buf = Memory_safeMalloc(1, len);
  
  	p = buf;
  	i2d_X509(x509, &p);