You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by hg...@apache.org on 2001/06/04 15:42:47 UTC
cvs commit: jakarta-tomcat-connectors/jk/src/native/common jk_service.h
hgomez 01/06/04 06:42:47
Modified: jk/src/native/apache-1.3 mod_jk.c
jk/src/native/common jk_service.h
Log:
Servlet API 2.3 require two attributes to be present in request
cypher_suite and key_size.
cypher_suite was allready present in ajp13 (Bravo Gal).
key_size is now added to mod_jk (Apache-1.3) and will be sent
in updated ajp13 or only in ajp14 (wait for tomcat-dev list replies)
Revision Changes Path
1.5 +31 -1 jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/apache-1.3/mod_jk.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mod_jk.c 2001/06/01 09:50:42 1.4
+++ mod_jk.c 2001/06/04 13:42:47 1.5
@@ -138,6 +138,7 @@
char *certs_indicator;
char *cipher_indicator;
char *session_indicator;
+ char *key_size_indicator;
/*
* Environment variables support
@@ -473,8 +474,9 @@
s->is_ssl = JK_FALSE;
s->ssl_cert = NULL;
s->ssl_cert_len = 0;
- s->ssl_cipher = NULL;
+ s->ssl_cipher = NULL; /* required by Servlet 2.3 Api, allready in original ajp13 */
s->ssl_session = NULL;
+ s->ssl_key_size = -1; /* required by Servlet 2.3 Api, added in jtc */
if(conf->ssl_enable || conf->envvars_in_use) {
ap_add_common_vars(r);
@@ -487,8 +489,14 @@
if(s->ssl_cert) {
s->ssl_cert_len = strlen(s->ssl_cert);
}
+ /* Servlet 2.3 API */
s->ssl_cipher = (char *)ap_table_get(r->subprocess_env, conf->cipher_indicator);
s->ssl_session = (char *)ap_table_get(r->subprocess_env, conf->session_indicator);
+
+ /* Servlet 2.3 API */
+ ssl_temp = (char *)ap_table_get(r->subprocess_env, conf->key_size_indicator);
+ if (ssl_temp)
+ s->ssl_key_size = atoi(ssl_temp);
}
}
@@ -834,6 +842,25 @@
}
/*
+ * JkKEYSIZEIndicator Directive Handling
+ *
+ * JkKEYSIZEIndicator SSL_CIPHER_USEKEYSIZE
+ */
+
+static const char *jk_set_key_size_indicator(cmd_parms *cmd,
+ void *dummy,
+ char *indicator)
+{
+ server_rec *s = cmd->server;
+ jk_server_conf_t *conf =
+ (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module);
+
+ conf->key_size_indicator = indicator;
+
+ return NULL;
+}
+
+/*
* JkEnvVar Directive Handling
*
* JkEnvVar MYOWNDIR
@@ -933,6 +960,8 @@
"Name of the Apache environment that contains SSL client cipher"},
{"JkSESSIONIndicator", jk_set_session_indicator, NULL, RSRC_CONF, TAKE1,
"Name of the Apache environment that contains SSL session"},
+ {"JkKEYSIZEIndicator", jk_set_key_size_indicator, NULL, RSRC_CONF, TAKE1,
+ "Name of the Apache environment that contains SSL key size in use"},
{"JkExtractSSL", jk_set_enable_ssl, NULL, RSRC_CONF, FLAG,
"Turns on SSL processing and information gathering by mod_jk"},
@@ -1058,6 +1087,7 @@
*/
c->cipher_indicator = "SSL_CIPHER";
c->session_indicator = "SSL_SESSION_ID";
+ c->key_size_indicator = "SSL_CIPHER_USEKEYSIZE";
if(!map_alloc(&(c->uri_to_context))) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, s, p, "Memory error");
1.3 +8 -1 jakarta-tomcat-connectors/jk/src/native/common/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/src/native/common/jk_service.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jk_service.h 2001/05/18 16:46:18 1.2
+++ jk_service.h 2001/06/04 13:42:47 1.3
@@ -59,7 +59,7 @@
* JVM connection point *
* Author: Gal Shachor <sh...@il.ibm.com> *
* Dan Milstein <da...@shore.net>
- * Version: $Revision: 1.2 $ *
+ * Version: $Revision: 1.3 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -163,6 +163,13 @@
char *ssl_cipher;
char *ssl_session;
+ /*
+ * SSL extra information for Servlet 2.3 API
+ *
+ * ssl_key_size - ssl key size in use
+ */
+ int ssl_key_size;
+
/*
* Headers, names and values.
*/