1 files changed, 53 insertions, 3 deletions

diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
index 5ca198d..014bfc8 100644
--- a/src/mod_gnutls.c
+++ b/src/mod_gnutls.c
@@ -63,15 +63,55 @@ static const command_rec mgs_config_cmds[] = {
     AP_INIT_TAKE1("GnuTLSClientCAFile", mgs_set_client_ca_file,
                   NULL,
                   RSRC_CONF,
-                  "Set the CA File for Client Certificates"),
+                  "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,
+                  "Set the file to read Diffie Hellman parameters from"),
+    AP_INIT_TAKE1("GnuTLSRSAFile", mgs_set_rsa_export_file,
+                  NULL,
+                  RSRC_CONF,
+                  "Set the file to read RSA-EXPORT parameters from"),
     AP_INIT_TAKE1("GnuTLSCertificateFile", mgs_set_cert_file,
                   NULL,
                   RSRC_CONF,
-                  "SSL Server Key file"),
+                  "SSL Server X509 Certificate file"),
     AP_INIT_TAKE1("GnuTLSKeyFile", mgs_set_key_file,
                   NULL,
                   RSRC_CONF,
-                  "SSL Server Certificate file"),
+                  "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"),
+    AP_INIT_TAKE1("GnuTLSSRPPasswdFile", mgs_set_srp_tpasswd_file,
+                  NULL,
+                  RSRC_CONF,
+                  "SSL Server SRP Password Conf file"),
+    AP_INIT_TAKE1("GnuTLSSRPPasswdConfFile", mgs_set_srp_tpasswd_conf_file,
+                  NULL,
+                  RSRC_CONF,
+                  "SSL Server SRP Parameters file"),
     AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
                   NULL,
                   RSRC_CONF,
@@ -80,10 +120,19 @@ static const command_rec mgs_config_cmds[] = {
                   NULL,
                   RSRC_CONF,
                   "Cache Configuration"),
+    AP_INIT_RAW_ARGS("GnuTLSPriorities", mgs_set_priorities,
+                  NULL,
+                  RSRC_CONF,
+                  "The priorities to enable (ciphers, Key exchange, macs, compression)."),
     AP_INIT_TAKE1("GnuTLSEnable", mgs_set_enabled,
                   NULL,
                   RSRC_CONF,
                   "Whether this server has GnuTLS Enabled. Default: Off"),
+    AP_INIT_TAKE1("GnuTLSExportCertificates", mgs_set_export_certificates_enabled,
+                  NULL,
+                  RSRC_CONF,
+                  "Whether to export PEM encoded certificates to CGIs. Default: Off"),
+#if 0
     AP_INIT_RAW_ARGS("<GnuTLSRequire", mgs_set_require_section,
                   NULL,
                   EXEC_ON_READ|OR_ALL,
@@ -92,6 +141,7 @@ static const command_rec mgs_config_cmds[] = {
                      NULL,
                      OR_ALL,
                      "Internal Command for reading Lua Bytecode."),
+#endif
     {NULL}
 };