From: Doug MacEachern Date: Fri, 18 Jan 2002 23:26:46 +0000 (+0000) Subject: move OpenSSL specific SSL_{get,set}_state macros to the #ifdef'd group of X-Git-Tag: 2.0.31~156 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdea8a54771d754f234a0d2d297a84203768266c;p=apache move OpenSSL specific SSL_{get,set}_state macros to the #ifdef'd group of macros for OpenSSL in mod_ssl.h git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92918 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index 3568e5c4c2..697158c81b 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -370,6 +370,15 @@ typedef enum { #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) \ diff --git a/modules/ssl/ssl_util_ssl.h b/modules/ssl/ssl_util_ssl.h index ec6086a335..150254de73 100644 --- a/modules/ssl/ssl_util_ssl.h +++ b/modules/ssl/ssl_util_ssl.h @@ -73,14 +73,6 @@ #define SSL_LIBRARY_TEXT "OtherSSL 0.0.0 00 XXX 0000" #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,