Mercurial > pidgin
changeset 27670:31905a0d1c9d
merge of '6f4d0e183ebb11a95980e184e63bd4709aa24306'
and '9fa808b57669d76c0989b16c2568cb7a7047511e'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 22 Jul 2009 06:12:13 +0000 |
| parents | b171a80dff25 (diff) 4c5f35f2b1ff (current diff) |
| children | 99baf778e0b9 |
| files | configure.ac libpurple/plugins/ssl/ssl-nss.c libpurple/server.c pidgin/pixmaps/dialogs/64/scalable/auth.svg pidgin/pixmaps/dialogs/64/scalable/cool.svg pidgin/pixmaps/dialogs/64/scalable/dialog.svg pidgin/pixmaps/dialogs/64/scalable/error.svg pidgin/pixmaps/dialogs/64/scalable/info.svg pidgin/pixmaps/dialogs/64/scalable/mail.svg pidgin/pixmaps/dialogs/64/scalable/question.svg pidgin/pixmaps/dialogs/64/scalable/warning.svg pidgin/pixmaps/emblems/16/scalable/aol-client.svg pidgin/pixmaps/emblems/16/scalable/birthday.svg pidgin/pixmaps/emblems/16/scalable/blocked.svg pidgin/pixmaps/emblems/16/scalable/bot.svg pidgin/pixmaps/emblems/16/scalable/external.svg pidgin/pixmaps/emblems/16/scalable/female.svg pidgin/pixmaps/emblems/16/scalable/free-for-chat.svg pidgin/pixmaps/emblems/16/scalable/game.svg pidgin/pixmaps/emblems/16/scalable/male.svg pidgin/pixmaps/emblems/16/scalable/mobile.svg pidgin/pixmaps/emblems/16/scalable/music.svg pidgin/pixmaps/emblems/16/scalable/not-authorized.svg pidgin/pixmaps/emblems/16/scalable/qq-member.svg pidgin/pixmaps/emblems/16/scalable/secure.svg pidgin/pixmaps/emblems/16/scalable/unavailable.svg pidgin/pixmaps/emblems/16/scalable/video.svg pidgin/pixmaps/emblems/16/scalable/voice.svg pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg pidgin/pixmaps/protocols/48/scalable/aim.svg pidgin/pixmaps/protocols/48/scalable/bonjour.svg pidgin/pixmaps/protocols/48/scalable/gadu-gadu.svg pidgin/pixmaps/protocols/48/scalable/google-talk.svg pidgin/pixmaps/protocols/48/scalable/icq.svg pidgin/pixmaps/protocols/48/scalable/irc.svg pidgin/pixmaps/protocols/48/scalable/jabber.svg pidgin/pixmaps/protocols/48/scalable/meanwhile.svg pidgin/pixmaps/protocols/48/scalable/msn.svg pidgin/pixmaps/protocols/48/scalable/novell.svg pidgin/pixmaps/protocols/48/scalable/qq.svg pidgin/pixmaps/protocols/48/scalable/silc.svg pidgin/pixmaps/protocols/48/scalable/simple.svg pidgin/pixmaps/protocols/48/scalable/yahoo.svg pidgin/pixmaps/protocols/48/scalable/zephyr.svg |
| diffstat | 2 files changed, 1 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jul 22 06:03:31 2009 +0000 +++ b/configure.ac Wed Jul 22 06:12:13 2009 +0000 @@ -604,7 +604,7 @@ ]) fi]) fi - + else # GTK enable_cap=no @@ -2046,23 +2046,6 @@ AC_SUBST(NSS_LIBS) fi -if test "x$enable_nss" = "xyes"; then - AC_MSG_CHECKING(for NSS_SetAlgorithmPolicy) - LIBS_save="$LIBS" - LIBS="$LIBS $NSS_LIBS" - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $NSS_CFLAGS" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss.h> -#include <secmod.h>]], - [[NSS_SetAlgorithmPolicy(SEC_OID_MD2, 0, 0);]])], - [AC_DEFINE([NEED_NSS_WEAK_ALGORITHMS], 1, - [Define if your NSS needs weak algorithms activated with NSS_SetAlgorithmPolicy]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) - CPPFLAGS="$CPPFLAGS_save" - LIBS="$LIBS_save" -fi - AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") if test "x$msg_nss" != "x" -a "x$msg_gnutls" != "x"; then
--- a/libpurple/plugins/ssl/ssl-nss.c Wed Jul 22 06:03:31 2009 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Wed Jul 22 06:12:13 2009 +0000 @@ -152,12 +152,6 @@ SSL_CipherPrefSetDefault(SSL_DHE_RSA_WITH_DES_CBC_SHA, 1); SSL_CipherPrefSetDefault(SSL_DHE_DSS_WITH_DES_CBC_SHA, 1); -#ifdef NEED_NSS_WEAK_ALGORITHMS - /* Enable some weaker algorithms for XMPP and MSN */ - NSS_SetAlgorithmPolicy(SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION, NSS_USE_ALG_IN_CERT_SIGNATURE, 0); - NSS_SetAlgorithmPolicy(SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION, NSS_USE_ALG_IN_CERT_SIGNATURE, 0); -#endif - _identity = PR_GetUniqueIdentity("Purple"); _nss_methods = PR_GetDefaultIOMethods(); }