You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by do...@apache.org on 2002/03/27 02:28:20 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_kernel.c ssl_util_ssl.c
dougm 02/03/26 17:28:20
Modified: modules/ssl mod_ssl.h ssl_engine_kernel.c ssl_util_ssl.c
Log:
add modssl_session_get_time() function to give mod_ssl what it needs
from SSL_SESSION_get_time() if using OpenSSL or sslc.
Revision Changes Path
1.87 +3 -0 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mod_ssl.h 27 Mar 2002 00:46:07 -0000 1.86
+++ mod_ssl.h 27 Mar 2002 01:28:20 -0000 1.87
@@ -774,5 +774,8 @@
char *ssl_util_ptxtsub(apr_pool_t *, const char *, const char *, char *);
void ssl_util_thread_setup(server_rec *, apr_pool_t *);
+/* util functions for OpenSSL+sslc compat */
+int modssl_session_get_time(SSL_SESSION *session);
+
#define APR_SHM_MAXSIZE (64 * 1024 * 1024)
#endif /* __MOD_SSL_H__ */
1.55 +1 -1 httpd-2.0/modules/ssl/ssl_engine_kernel.c
Index: ssl_engine_kernel.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ssl_engine_kernel.c 26 Mar 2002 16:57:49 -0000 1.54
+++ ssl_engine_kernel.c 27 Mar 2002 01:28:20 -0000 1.55
@@ -1601,7 +1601,7 @@
id = SSL_SESSION_get_session_id(session);
idlen = SSL_SESSION_get_session_id_length(session);
- timeout += SSL_get_time(session);
+ timeout += modssl_session_get_time(session);
rc = ssl_scache_store(s, id, idlen, timeout, session);
1.13 +12 -0 httpd-2.0/modules/ssl/ssl_util_ssl.c
Index: ssl_util_ssl.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ssl_util_ssl.c 13 Mar 2002 20:47:55 -0000 1.12
+++ ssl_util_ssl.c 27 Mar 2002 01:28:20 -0000 1.13
@@ -550,3 +550,15 @@
return str;
}
+/* sslc+OpenSSL compat */
+
+int modssl_session_get_time(SSL_SESSION *session)
+{
+#ifdef OPENSSL_VERSION_NUMBER
+ return SSL_SESSION_get_time(session);
+#else /* assume sslc */
+ CRYPTO_TIME_T ct;
+ SSL_SESSION_get_time(session, &ct);
+ return CRYPTO_time_to_int(&ct);
+#endif
+}