From 83e47ec2da907fd3d8e95e4790bdfd0e9fb50836 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sat, 16 Oct 2010 23:44:35 -0700
Subject: Use gcrypt for 3DES encryption (used for new MSN authentication) so
 we mostly don't need lib/des.c anymore.

---
 configure | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index fa7a76bd..ff68da8a 100755
--- a/configure
+++ b/configure
@@ -268,15 +268,15 @@ detect_gnutls()
 {
 	if $PKG_CONFIG --exists gnutls; then
 		cat <<EOF>>Makefile.settings
-EFLAGS+=`$PKG_CONFIG --libs gnutls`
-CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EFLAGS+=`$PKG_CONFIG --libs gnutls` `libgcrypt-config --libs`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls` `libgcrypt-config --cflags`
 EOF
 		ssl=gnutls
 		ret=1
 	elif libgnutls-config --version > /dev/null 2> /dev/null; then
 		cat <<EOF>>Makefile.settings
-EFLAGS+=`libgnutls-config --libs`
-CFLAGS+=`libgnutls-config --cflags`
+EFLAGS+=`libgnutls-config --libs` `libgcrypt-config --libs`
+CFLAGS+=`libgnutls-config --cflags` `libgcrypt-config --cflags`
 EOF
 		
 		ssl=gnutls
@@ -426,9 +426,11 @@ if [ "$ret" = "0" ]; then
 	exit 1
 fi;
 
-if [ "$msn" = "1" -a "$ssl" != "openssl" ]; then
+if [ "$msn" = "1" -a "$ssl" != "openssl" -a "$ssl" != "gnutls" ]; then
 	# Needed for MSN only. OpenSSL exports nice cipher functions already,
-	# others don't, so use our own 3des code.
+	# in case of GnuTLS we should be able to use gcrypt. Otherwise, use
+	# built-in stuff. (Since right now those are the only two supported
+	# SSL modules anyway, this is mostly unnecessary.)
 	echo 'DES=des.o' >> Makefile.settings
 fi
 
-- 
cgit v1.2.3