From e02dd8c03ce5b66c81a47830eebe73a21ce71002 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 25 Oct 2010 19:21:04 +0000
Subject: indented code

---
(limited to 'src/mod_gnutls.c')

diff --git a/src/mod_gnutls.c b/src/mod_gnutls.c
index c95d183..49f4e43 100644
--- a/src/mod_gnutls.c
+++ b/src/mod_gnutls.c
@@ -19,143 +19,146 @@
 
 static void gnutls_hooks(apr_pool_t * p)
 {
-    ap_hook_pre_connection(mgs_hook_pre_connection, NULL, NULL,
-                           APR_HOOK_MIDDLE);
-    ap_hook_post_config(mgs_hook_post_config, NULL, NULL,
-                        APR_HOOK_MIDDLE);
-    ap_hook_child_init(mgs_hook_child_init, NULL, NULL,
-                       APR_HOOK_MIDDLE);
+	ap_hook_pre_connection(mgs_hook_pre_connection, NULL, NULL,
+			       APR_HOOK_MIDDLE);
+	ap_hook_post_config(mgs_hook_post_config, NULL, NULL,
+			    APR_HOOK_MIDDLE);
+	ap_hook_child_init(mgs_hook_child_init, NULL, NULL,
+			   APR_HOOK_MIDDLE);
 #if USING_2_1_RECENT
-    ap_hook_http_scheme(mgs_hook_http_scheme, NULL, NULL,
-                        APR_HOOK_MIDDLE);
+	ap_hook_http_scheme(mgs_hook_http_scheme, NULL, NULL,
+			    APR_HOOK_MIDDLE);
 #else
-    ap_hook_http_method(mgs_hook_http_scheme, NULL, NULL,
-                        APR_HOOK_MIDDLE);
+	ap_hook_http_method(mgs_hook_http_scheme, NULL, NULL,
+			    APR_HOOK_MIDDLE);
 #endif
-    ap_hook_default_port(mgs_hook_default_port, NULL, NULL,
-                         APR_HOOK_MIDDLE);
-    ap_hook_pre_config(mgs_hook_pre_config, NULL, NULL,
-                       APR_HOOK_MIDDLE);
-    
-    ap_hook_access_checker(mgs_hook_authz, NULL, NULL, APR_HOOK_REALLY_FIRST);
-    
-    ap_hook_fixups(mgs_hook_fixups, NULL, NULL, APR_HOOK_REALLY_FIRST);
-    
-    /* TODO: HTTP Upgrade Filter */
-    /* ap_register_output_filter ("UPGRADE_FILTER", 
-     *          ssl_io_filter_Upgrade, NULL, AP_FTYPE_PROTOCOL + 5);
-     */
+	ap_hook_default_port(mgs_hook_default_port, NULL, NULL,
+			     APR_HOOK_MIDDLE);
+	ap_hook_pre_config(mgs_hook_pre_config, NULL, NULL,
+			   APR_HOOK_MIDDLE);
 
-    ap_register_input_filter(GNUTLS_INPUT_FILTER_NAME,
-                             mgs_filter_input, NULL,
-                             AP_FTYPE_CONNECTION + 5);
-    ap_register_output_filter(GNUTLS_OUTPUT_FILTER_NAME,
-                              mgs_filter_output, NULL,
-                              AP_FTYPE_CONNECTION + 5);
+	ap_hook_access_checker(mgs_hook_authz, NULL, NULL,
+			       APR_HOOK_REALLY_FIRST);
+
+	ap_hook_fixups(mgs_hook_fixups, NULL, NULL, APR_HOOK_REALLY_FIRST);
+
+	/* TODO: HTTP Upgrade Filter */
+	/* ap_register_output_filter ("UPGRADE_FILTER", 
+	 *          ssl_io_filter_Upgrade, NULL, AP_FTYPE_PROTOCOL + 5);
+	 */
+
+	ap_register_input_filter(GNUTLS_INPUT_FILTER_NAME,
+				 mgs_filter_input, NULL,
+				 AP_FTYPE_CONNECTION + 5);
+	ap_register_output_filter(GNUTLS_OUTPUT_FILTER_NAME,
+				  mgs_filter_output, NULL,
+				  AP_FTYPE_CONNECTION + 5);
 }
 
 static const command_rec mgs_config_cmds[] = {
-    AP_INIT_TAKE1("GnuTLSClientVerify", mgs_set_client_verify,
-                  NULL,
-                  RSRC_CONF|OR_AUTHCFG,
-                  "Set Verification Requirements of the Client Certificate"),
-    AP_INIT_TAKE1("GnuTLSClientCAFile", mgs_set_client_ca_file,
-                  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,
-                  "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 X509 Certificate 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"),
+	AP_INIT_TAKE1("GnuTLSClientVerify", mgs_set_client_verify,
+		      NULL,
+		      RSRC_CONF | OR_AUTHCFG,
+		      "Set Verification Requirements of the Client Certificate"),
+	AP_INIT_TAKE1("GnuTLSClientCAFile", mgs_set_client_ca_file,
+		      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,
+		      "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 X509 Certificate 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"),
 #ifdef ENABLE_SRP
-    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("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"),
 #endif
-    AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
-                  NULL,
-                  RSRC_CONF,
-                  "Cache Timeout"),
-    AP_INIT_TAKE2("GnuTLSCache", mgs_set_cache,
-                  NULL,
-                  RSRC_CONF,
-                  "Cache Configuration"),
-    AP_INIT_TAKE1("GnuTLSSessionTickets", mgs_set_tickets,
-                  NULL,
-                  RSRC_CONF,
-                  "Session Tickets 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"),
+	AP_INIT_TAKE1("GnuTLSCacheTimeout", mgs_set_cache_timeout,
+		      NULL,
+		      RSRC_CONF,
+		      "Cache Timeout"),
+	AP_INIT_TAKE2("GnuTLSCache", mgs_set_cache,
+		      NULL,
+		      RSRC_CONF,
+		      "Cache Configuration"),
+	AP_INIT_TAKE1("GnuTLSSessionTickets", mgs_set_tickets,
+		      NULL,
+		      RSRC_CONF,
+		      "Session Tickets 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,
-                  "Whether this server has GnuTLS Enabled. Default: Off"),
-    AP_INIT_RAW_ARGS("GnuTLSRequireByteCode", mgs_set_require_bytecode,
-                     NULL,
-                     OR_ALL,
-                     "Internal Command for reading Lua Bytecode."),
+	AP_INIT_RAW_ARGS("<GnuTLSRequire", mgs_set_require_section,
+			 NULL,
+			 EXEC_ON_READ | OR_ALL,
+			 "Whether this server has GnuTLS Enabled. Default: Off"),
+	AP_INIT_RAW_ARGS("GnuTLSRequireByteCode", mgs_set_require_bytecode,
+			 NULL,
+			 OR_ALL,
+			 "Internal Command for reading Lua Bytecode."),
 #endif
-    {NULL}
+	{NULL}
 };
 
 module AP_MODULE_DECLARE_DATA gnutls_module = {
-    STANDARD20_MODULE_STUFF,
-    mgs_config_dir_create,
-    mgs_config_dir_merge,
-    mgs_config_server_create,
-    NULL,
-    mgs_config_cmds,
-    gnutls_hooks
+	STANDARD20_MODULE_STUFF,
+	mgs_config_dir_create,
+	mgs_config_dir_merge,
+	mgs_config_server_create,
+	NULL,
+	mgs_config_cmds,
+	gnutls_hooks
 };
--
cgit v0.9.2