diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2005-07-08 16:38:50 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2005-07-08 16:38:50 +0200 |
| commit | 6b8a49561d61fc59d3c1b6915ad613eef918f151 (patch) | |
| tree | aa04f0ae94b9b388a73db8c77e8f5d6177de6033 /modules/ssl/ssl_toolkit_compat.h | |
| parent | The request smuggling issue did get assigned CAN-2005-2088. (diff) | |
| download | apache2-6b8a49561d61fc59d3c1b6915ad613eef918f151.tar.xz apache2-6b8a49561d61fc59d3c1b6915ad613eef918f151.zip | |
Joe strongly objected to this outgoing style; use this incoming
style for const modifiers so the reader can still follow that
the data is [const] unsigned char *
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209795 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl/ssl_toolkit_compat.h')
| -rw-r--r-- | modules/ssl/ssl_toolkit_compat.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h index 16e303662e..de10f9dbf1 100644 --- a/modules/ssl/ssl_toolkit_compat.h +++ b/modules/ssl/ssl_toolkit_compat.h @@ -85,6 +85,21 @@ #define MODSSL_CLIENT_CERT_CB_ARG_TYPE X509 #define MODSSL_PCHAR_CAST +/* ...shifting sands of openssl... */ +#if (OPENSSL_VERSION_NUMBER >= 0x0090707f) +# define MODSSL_D2I_SSL_SESSION_CONST const +#else +# define MODSSL_D2I_SSL_SESSION_CONST +#endif + +#if (OPENSSL_VERSION_NUMBER >= 0x00908000) +# define MODSSL_D2I_PrivateKey_CONST const +# define MODSSL_D2I_X509_CONST const +#else +# define MODSSL_D2I_PrivateKey_CONST +# define MODSSL_D2I_X509_CONST +#endif + #define modssl_X509_verify_cert X509_verify_cert typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*); @@ -146,6 +161,9 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*); #define MODSSL_INFO_CB_ARG_TYPE SSL* #define MODSSL_CLIENT_CERT_CB_ARG_TYPE void #define MODSSL_PCHAR_CAST (char *) +#define MODSSL_D2I_SSL_SESSION_CONST +#define MODSSL_D2I_PrivateKey_CONST +#define MODSSL_D2I_X509_CONST typedef int (modssl_read_bio_cb_fn)(char*,int,int); |