${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")
# 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
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
#include "conf.h"
#include "log.h"
+ #include "memory.h"
#include "ssl.h"
/*
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) {
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));
}
}
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);