svn commit: samba r8482 - in branches/SAMBA_4_0/source: . lib/tls web_server

[tridge at samba.org]

Author: tridge
Date: 2005-07-15 07:00:12 +0000 (Fri, 15 Jul 2005)
New Revision: 8482

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8482

Log:
gnutls_x509_crt_set_subject_key_id is not available in some versions
of gnutls. Thanks to ab for spotting this.

Added:
   branches/SAMBA_4_0/source/lib/tls/config.m4
Modified:
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/lib/tls/tlscert.c
   branches/SAMBA_4_0/source/web_server/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2005-07-15 05:40:34 UTC (rev 8481)
+++ branches/SAMBA_4_0/source/configure.in	2005-07-15 07:00:12 UTC (rev 8482)
@@ -19,6 +19,7 @@
 sinclude(lib/tdb/config.m4)
 sinclude(lib/ldb/sqlite3.m4)
 sinclude(lib/ldb/config.m4)
+sinclude(lib/tls/config.m4)
 sinclude(lib/events/config.m4)
 sinclude(lib/cmdline/config.m4)
 

Added: branches/SAMBA_4_0/source/lib/tls/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/config.m4	2005-07-15 05:40:34 UTC (rev 8481)
+++ branches/SAMBA_4_0/source/lib/tls/config.m4	2005-07-15 07:00:12 UTC (rev 8482)
@@ -0,0 +1,16 @@
+###############################
+# start SMB_EXT_LIB_GNUTLS
+# check for gnutls/gnutls.h and -lgnutls
+AC_CHECK_HEADERS(gnutls/gnutls.h)
+AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
+if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes";then
+	SMB_EXT_LIB_ENABLE(GNUTLS,YES)
+	AC_CHECK_DECL(gnutls_x509_crt_set_subject_key_id,  
+	              [AC_DEFINE(HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID,1,gnutls subject_key)], [], [
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+])
+fi
+SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
+# end SMB_EXT_LIB_GNUTLS
+###############################

Modified: branches/SAMBA_4_0/source/lib/tls/tlscert.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/tlscert.c	2005-07-15 05:40:34 UTC (rev 8481)
+++ branches/SAMBA_4_0/source/lib/tls/tlscert.c	2005-07-15 07:00:12 UTC (rev 8482)
@@ -94,7 +94,9 @@
 #endif
 	TLSCHECK(gnutls_x509_crt_set_version(cacrt, 3));
 	TLSCHECK(gnutls_x509_crt_get_key_id(cacrt, 0, keyid, &keyidsize));
+#if HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
 	TLSCHECK(gnutls_x509_crt_set_subject_key_id(cacrt, keyid, keyidsize));
+#endif
 	TLSCHECK(gnutls_x509_crt_sign(cacrt, cacrt, cakey));
 
 	DEBUG(3,("Generating TLS certificate\n"));
@@ -118,7 +120,9 @@
 #endif
 	TLSCHECK(gnutls_x509_crt_set_version(crt, 3));
 	TLSCHECK(gnutls_x509_crt_get_key_id(crt, 0, keyid, &keyidsize));
+#if HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
 	TLSCHECK(gnutls_x509_crt_set_subject_key_id(crt, keyid, keyidsize));
+#endif
 	TLSCHECK(gnutls_x509_crt_sign(crt, crt, key));
 
 	DEBUG(3,("Exporting TLS keys\n"));

Modified: branches/SAMBA_4_0/source/web_server/config.m4
===================================================================
--- branches/SAMBA_4_0/source/web_server/config.m4	2005-07-15 05:40:34 UTC (rev 8481)
+++ branches/SAMBA_4_0/source/web_server/config.m4	2005-07-15 07:00:12 UTC (rev 8482)
@@ -1,13 +1,2 @@
 AC_CHECK_HEADERS(setjmp.h)
 
-###############################
-# start SMB_EXT_LIB_GNUTLS
-# check for gnutls/gnutls.h and -lgnutls
-AC_CHECK_HEADERS(gnutls/gnutls.h)
-AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
-if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes";then
-	SMB_EXT_LIB_ENABLE(GNUTLS,YES)
-fi
-SMB_EXT_LIB(GNUTLS, $GNUTLS_LIBS)
-# end SMB_EXT_LIB_GNUTLS
-###############################