From 18e32f340e638c586282321531ef4df4a527711c Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Wed, 27 Mar 2002 00:46:07 +0000 Subject: [PATCH] another step towards compatiblity with rsa sslc: define the STACK_OF macro if not already defined. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94194 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index e83ed601d0..e165bb296b 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -329,6 +329,12 @@ typedef enum { #ifdef OPENSSL_VERSION_NUMBER +/* + * rsa sslc uses incomplete types for most structures + * so we macroize for OpenSSL those which cannot be dereferenced + * using the same sames as the sslc functions + */ + #define EVP_PKEY_key_type(k) (EVP_PKEY_type(k->type)) #define X509_NAME_get_entries(xs) (xs->entries) @@ -358,8 +364,16 @@ typedef enum { #define SSL_set_state(ssl,val) (ssl)->state = val +#else + +/* support some OpenSSL-izms for compat with ssl */ + +#ifndef STACK_OF +#define STACK_OF(type) STACK #endif +#endif /* OPENSSL_VERSION_NUMBER */ + #define ssl_verify_error_is_optional(errnum) \ ((errnum == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) \ || (errnum == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN) \ -- 2.40.0