From 7c87bca18df74c93b57545af00bd592219b89208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Thu, 15 Sep 2011 16:09:28 -0400
Subject: [PATCH] pjlib: fix build without SSLv2, fix warnings
---
daemon/libs/pjproject/pjlib/include/pj/compat/string.h | 5 ++++-
daemon/libs/pjproject/pjlib/src/pj/ssl_sock_common.c | 9 ---------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/daemon/libs/pjproject/pjlib/include/pj/compat/string.h b/daemon/libs/pjproject/pjlib/include/pj/compat/string.h
index a2a78b392c..3737230c5a 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 aad24daf97..8e3d3797c1 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"}
};
--
GitLab