aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS5
-rw-r--r--README24
-rw-r--r--configure.ac4
-rw-r--r--src/gnutls_hooks.c2
4 files changed, 28 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index f8b524e..a9fe9fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
1** Version 0.5.0 1** Version 0.5.0-alpha (2008-01-24)
2 2
3- Added support for OpenPGP keys. 3- Added support for OpenPGP keys. The new directives are:
4 GnuTLSPGPKeyringFile, GnuTLSPGPCertificateFile, GnuTLSPGPKeyFile
4 5
5** Version 0.4.2 (2007-12-10) 6** Version 0.4.2 (2007-12-10)
6 7
diff --git a/README b/README
index 4660ac7..5198ed7 100644
--- a/README
+++ b/README
@@ -60,7 +60,6 @@ GnuTLSCache dbm conf/gnutls_cache
60 GnuTLSX509CertificateFile conf/server.cert 60 GnuTLSX509CertificateFile conf/server.cert
61</VirtualHost> 61</VirtualHost>
62 62
63
64# a more advanced configuration 63# a more advanced configuration
65GnuTLSCache dbm "/var/cache/www-tls-cache/cache" 64GnuTLSCache dbm "/var/cache/www-tls-cache/cache"
66GnuTLSCacheTimeout 600 65GnuTLSCacheTimeout 600
@@ -87,3 +86,26 @@ NameVirtualHost 1.2.3.4:443
87 GnuTLSX509CAFile ca.pem 86 GnuTLSX509CAFile ca.pem
88 ... 87 ...
89</VirtualHost> 88</VirtualHost>
89
90# A setup for OpenPGP and X.509 authentication
91<VirtualHost 1.2.3.4:443>
92 Servername crystal.lan:443
93 GnuTLSEnable on
94 GnuTLSPriorities NORMAL:+COMP-NULL
95
96# setup the openpgp keys
97 GnuTLSPGPCertificateFile /etc/apache2/test.pub.asc
98 GnuTLSPGPKeyFile /etc/apache2/test.sec.asc
99
100# and the X.509 keys
101 GnuTLSCertificateFile /etc/apache2/server-cert.pem
102 GnuTLSKeyFile /etc/apache2/server-key.pem
103 GnuTLSClientVerify ignore
104
105# To avoid using the default DH params
106 GnuTLSDHFile /etc/apache2/dh.pem
107
108# these are only needed if GnuTLSClientVerify != ignore
109 GnuTLSClientCAFile ca.pem
110 GnuTLSPGPKeyringFile /etc/apache2/ring.asc
111</VirtualHost>
diff --git a/configure.ac b/configure.ac
index 5f3a8a6..cf7cd87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1dnl 1dnl
2AC_INIT(mod_gnutls, 0.5.0) 2AC_INIT(mod_gnutls, 0.5.0-alpha)
3OOO_CONFIG_NICE(config.nice) 3OOO_CONFIG_NICE(config.nice)
4MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION 4MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
5AC_PREREQ(2.53) 5AC_PREREQ(2.53)
@@ -28,7 +28,7 @@ CHECK_APACHE(,$AP_VERSION,
28dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`" 28dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
29dnl AC_SUBST(LIBTOOL) 29dnl AC_SUBST(LIBTOOL)
30 30
31MIN_TLS_VERSION=2.1.7 31MIN_TLS_VERSION=2.2.1
32AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,, 32AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,,
33 AC_MSG_ERROR([[ 33 AC_MSG_ERROR([[
34*** 34***
diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index 6f4fead..26917b8 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -159,8 +159,6 @@ static int mgs_select_virtual_server_cb(gnutls_session_t session)
159 gnutls_certificate_type_set_priority( session, cprio); 159 gnutls_certificate_type_set_priority( session, cprio);
160 } 160 }
161 161
162
163
164 return 0; 162 return 0;
165} 163}
166 164