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/01/19 00:26:46 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_util_ssl.h
dougm 02/01/18 15:26:46
Modified: modules/ssl mod_ssl.h ssl_util_ssl.h
Log:
move OpenSSL specific SSL_{get,set}_state macros to the #ifdef'd group of
macros for OpenSSL in mod_ssl.h
Revision Changes Path
1.55 +9 -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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mod_ssl.h 17 Jan 2002 00:54:33 -0000 1.54
+++ mod_ssl.h 18 Jan 2002 23:26:46 -0000 1.55
@@ -370,6 +370,15 @@
#define SSL_SESSION_get_session_id(s) (s->session_id)
#define SSL_SESSION_get_session_id_length(s) (s->session_id_length)
+/*
+ * Support for retrieving/overriding states
+ */
+#ifndef SSL_get_state
+#define SSL_get_state(ssl) SSL_state(ssl)
+#endif
+
+#define SSL_set_state(ssl,val) (ssl)->state = val
+
#endif
#define ssl_verify_error_is_optional(errnum) \
1.12 +0 -8 httpd-2.0/modules/ssl/ssl_util_ssl.h
Index: ssl_util_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_ssl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ssl_util_ssl.h 21 Nov 2001 22:58:28 -0000 1.11
+++ ssl_util_ssl.h 18 Jan 2002 23:26:46 -0000 1.12
@@ -74,14 +74,6 @@
#endif
/*
- * Support for retrieving/overriding states
- */
-#ifndef SSL_get_state
-#define SSL_get_state(ssl) SSL_state(ssl)
-#endif
-#define SSL_set_state(ssl,val) (ssl)->state = val
-
-/*
* Maximum length of a DER encoded session.
* FIXME: There is no define in OpenSSL, but OpenSSL uses 1024*10,
* so this value should be ok. Although we have no warm feeling.