diff --git a/daemon/libs/pjproject/pjlib/include/pj/compat/string.h b/daemon/libs/pjproject/pjlib/include/pj/compat/string.h index a2a78b392c97c2f5fe079ed8bf16a6c3e646f4c4..3737230c5ae5835e9817430438ce0f78ec06d139 100644 --- a/daemon/libs/pjproject/pjlib/include/pj/compat/string.h +++ b/daemon/libs/pjproject/pjlib/include/pj/compat/string.h @@ -52,9 +52,12 @@ # define wcsicmp _wcsicmp # define wcsnicmp _wcsnicmp #else +#ifndef stricmp # define stricmp strcasecmp +#endif +#ifndef strnicmp # define strnicmp strncasecmp - +#endif # if defined(PJ_NATIVE_STRING_IS_UNICODE) && PJ_NATIVE_STRING_IS_UNICODE!=0 # error "Implement Unicode string functions" # endif diff --git a/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c b/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c index aad24daf9731553835ca87bca7208d8e8d5d44bf..8e3d3797c19f8ef0ed35e85fffe763e88668738c 100644 --- a/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c +++ b/daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c @@ -92,15 +92,6 @@ static cipher_name_t cipher_names[] = {PJ_SSL_FORTEZZA_KEA_WITH_NULL_SHA, "SSL_FORTEZZA_KEA_WITH_NULL_SHA"}, {PJ_SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA,"SSL_FORTEZZA_KEA_WITH_FORTEZZA_CBC_SHA"}, {PJ_SSL_FORTEZZA_KEA_WITH_RC4_128_SHA, "SSL_FORTEZZA_KEA_WITH_RC4_128_SHA"}, - - /* SSLv2 */ - {PJ_SSL_CK_RC4_128_WITH_MD5, "SSL_CK_RC4_128_WITH_MD5"}, - {PJ_SSL_CK_RC4_128_EXPORT40_WITH_MD5, "SSL_CK_RC4_128_EXPORT40_WITH_MD5"}, - {PJ_SSL_CK_RC2_128_CBC_WITH_MD5, "SSL_CK_RC2_128_CBC_WITH_MD5"}, - {PJ_SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5, "SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5"}, - {PJ_SSL_CK_IDEA_128_CBC_WITH_MD5, "SSL_CK_IDEA_128_CBC_WITH_MD5"}, - {PJ_SSL_CK_DES_64_CBC_WITH_MD5, "SSL_CK_DES_64_CBC_WITH_MD5"}, - {PJ_SSL_CK_DES_192_EDE3_CBC_WITH_MD5, "SSL_CK_DES_192_EDE3_CBC_WITH_MD5"} };