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 @@
-** Version 0.5.0
+** Version 0.5.0-alpha (2008-01-24)
 
-- Added support for OpenPGP keys.
+- Added support for OpenPGP keys. The new directives are:
+  GnuTLSPGPKeyringFile, GnuTLSPGPCertificateFile, GnuTLSPGPKeyFile
 
 ** Version 0.4.2 (2007-12-10)
 
diff --git a/README b/README
index 4660ac7..5198ed7 100644
--- a/README
+++ b/README
@@ -60,7 +60,6 @@ GnuTLSCache dbm conf/gnutls_cache
     GnuTLSX509CertificateFile conf/server.cert
 </VirtualHost>
 
-
 # a more advanced configuration
 GnuTLSCache dbm "/var/cache/www-tls-cache/cache"
 GnuTLSCacheTimeout 600
@@ -87,3 +86,26 @@ NameVirtualHost 1.2.3.4:443
         GnuTLSX509CAFile ca.pem
         ...
 </VirtualHost>
+
+# A setup for OpenPGP and X.509 authentication
+<VirtualHost 1.2.3.4:443>
+        Servername crystal.lan:443
+        GnuTLSEnable on
+        GnuTLSPriorities NORMAL:+COMP-NULL
+
+# setup the openpgp keys
+        GnuTLSPGPCertificateFile /etc/apache2/test.pub.asc
+        GnuTLSPGPKeyFile /etc/apache2/test.sec.asc
+
+# and the X.509 keys
+        GnuTLSCertificateFile /etc/apache2/server-cert.pem
+        GnuTLSKeyFile /etc/apache2/server-key.pem
+        GnuTLSClientVerify ignore
+
+# To avoid using the default DH params
+        GnuTLSDHFile /etc/apache2/dh.pem
+
+# these are only needed if GnuTLSClientVerify != ignore
+        GnuTLSClientCAFile ca.pem
+        GnuTLSPGPKeyringFile /etc/apache2/ring.asc
+</VirtualHost>
diff --git a/configure.ac b/configure.ac
index 5f3a8a6..cf7cd87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl 
-AC_INIT(mod_gnutls, 0.5.0)
+AC_INIT(mod_gnutls, 0.5.0-alpha)
 OOO_CONFIG_NICE(config.nice)
 MOD_GNUTLS_VERSION=AC_PACKAGE_VERSION
 AC_PREREQ(2.53)
@@ -28,7 +28,7 @@ CHECK_APACHE(,$AP_VERSION,
 dnl LIBTOOL="`${APR_CONFIG} --apr-libtool`"
 dnl AC_SUBST(LIBTOOL)
 
-MIN_TLS_VERSION=2.1.7
+MIN_TLS_VERSION=2.2.1
 AM_PATH_LIBGNUTLS_EXTRA($MIN_TLS_VERSION,,
         AC_MSG_ERROR([[
 ***  
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)
         gnutls_certificate_type_set_priority( session, cprio);
     }
 
-
-
     return 0;
 }