Commit 26fcfc75 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

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/modules/ssl@94194 13f79535-47bb-0310-9956-ffa450edef68
parent e2b7201c

mod_ssl.h

+14 −0
Changes for mod_ssl.h: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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) \