added new branch

1 files changed, 2 insertions, 26 deletions

diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
index 014bfc8..a6e5528 100644
--- a/src/mod_gnutls.c
+++ b/src/mod_gnutls.c
@@ -64,14 +64,6 @@ static const command_rec mgs_config_cmds[] = {
                   NULL,
                   RSRC_CONF,
                   "Set the CA File to verify Client Certificates"),
-    AP_INIT_TAKE1("GnuTLSX509CAFile", mgs_set_client_ca_file,
-                  NULL,
-                  RSRC_CONF,
-                  "Set the CA File to verify Client Certificates"),
-    AP_INIT_TAKE1("GnuTLSPGPKeyringFile", mgs_set_keyring_file,
-                  NULL,
-                  RSRC_CONF,
-                  "Set the Keyring File to verify Client Certificates"),
     AP_INIT_TAKE1("GnuTLSDHFile", mgs_set_dh_file,
                   NULL,
                   RSRC_CONF,
@@ -83,27 +75,11 @@ static const command_rec mgs_config_cmds[] = {
     AP_INIT_TAKE1("GnuTLSCertificateFile", mgs_set_cert_file,
                   NULL,
                   RSRC_CONF,
-                  "SSL Server X509 Certificate file"),
+                  "SSL Server Key file"),
     AP_INIT_TAKE1("GnuTLSKeyFile", mgs_set_key_file,
                   NULL,
                   RSRC_CONF,
-                  "SSL Server X509 Private Key file"),
-    AP_INIT_TAKE1("GnuTLSX509CertificateFile", mgs_set_cert_file,
-                  NULL,
-                  RSRC_CONF,
-                  "SSL Server X509 Certificate file"),
-    AP_INIT_TAKE1("GnuTLSX509KeyFile", mgs_set_key_file,
-                  NULL,
-                  RSRC_CONF,
-                  "SSL Server X509 Private Key file"),
-    AP_INIT_TAKE1("GnuTLSPGPCertificateFile", mgs_set_pgpcert_file,
-                  NULL,
-                  RSRC_CONF,
-                  "SSL Server PGP Certificate file"),
-    AP_INIT_TAKE1("GnuTLSPGPKeyFile", mgs_set_pgpkey_file,
-                  NULL,
-                  RSRC_CONF,
-                  "SSL Server PGP Private key file"),
+                  "SSL Server SRP Password file"),
     AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
                   NULL,
                   RSRC_CONF,