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

diff --combined src/CMakeLists.txt
index 15473d3c1aedf07196d964e937032a9c1bf96500,48b244e30551067716264b7a2e4652e65d3fa710..f89f00863080ffe0c9dfd03e6c0e83af5d5c32b7
--- 1/src/CMakeLists.txt
--- 2/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 3b37ba8523cbda695cddd950e28712e6ed54d8f8,b4bc3fd19ec4e84779e80393c2702f1e95dcef83..e508d80c63a180b5f67345745649876965b98ae0
--- 1/src/Makefile.am
--- 2/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 de081fa8dac69a61ed0bae4f50122a45ade326c0,ee839b8e39412fb084e7f4e1d02e75367ffb3449..bcd4d9e7897ea24005d76c6034de801772b9bc38
--- 1/src/ssli_openssl.c
--- 2/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);