/pidgin/main: 4004f3e4879c: Remove check for GnuTLS feature that...
Michael McConville
mmcconville at mykolab.com
Wed Jul 22 16:39:15 EDT 2015
Changeset: 4004f3e4879c82e554d571f921f3803be94e754d
Author: Michael McConville <mmcconville at mykolab.com>
Date: 2015-07-22 16:38 -0400
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/4004f3e4879c
Description:
Remove check for GnuTLS feature that was added 10+ years ago. Ok'd by elb. Refs #10412
diffstat:
configure.ac | 16 ----------------
libpurple/plugins/ssl/ssl-gnutls.c | 2 --
2 files changed, 0 insertions(+), 18 deletions(-)
diffs (45 lines):
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2182,22 +2182,6 @@ if test "x$enable_gnutls" = "xyes"; then
LIBS="$LIBS_save"
fi
-if test "x$enable_gnutls" = "xyes"; then
- AC_MSG_CHECKING(for GNUTLS_CERT_INSECURE_ALGORITHM)
- LIBS_save="$LIBS"
- LIBS="$LIBS $GNUTLS_LIBS"
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $GNUTLS_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]],
- [[unsigned int verify = GNUTLS_CERT_INSECURE_ALGORITHM;]])],
- [AC_DEFINE([HAVE_GNUTLS_CERT_INSECURE_ALGORITHM], 1,
- [Define if your gnutls has the GNUTLS_CERT_INSECURE_ALGORITHM flag])
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
- CPPFLAGS="$CPPFLAGS_save"
- LIBS="$LIBS_save"
-fi
-
AM_CONDITIONAL(USE_GNUTLS, test "x$enable_gnutls" = "xyes")
diff --git a/libpurple/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
@@ -1093,7 +1093,6 @@ x509_certificate_signed_by(PurpleCertifi
return FALSE;
}
-#ifdef HAVE_GNUTLS_CERT_INSECURE_ALGORITHM
if (verify & GNUTLS_CERT_INSECURE_ALGORITHM) {
/*
* A certificate in the chain is signed with an insecure
@@ -1107,7 +1106,6 @@ x509_certificate_signed_by(PurpleCertifi
"Insecure hash algorithm used by %s to sign %s\n",
issuer_id, crt_id);
}
-#endif
if (verify & GNUTLS_CERT_INVALID) {
/* Signature didn't check out, but at least
More information about the Commits
mailing list