summaryrefslogtreecommitdiffstats
path: root/modules/ssl
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2010-07-19 00:49:59 +0200
committerGuenter Knauf <fuankg@apache.org>2010-07-19 00:49:59 +0200
commitf27014e2947c2392cdf1067aec8dc2e658d22163 (patch)
tree25c6709fa05d4909e10bacf77c642671b224ac6e /modules/ssl
parentnote some work in progress (diff)
downloadapache2-f27014e2947c2392cdf1067aec8dc2e658d22163.tar.xz
apache2-f27014e2947c2392cdf1067aec8dc2e658d22163.zip
fixed const for d2i_ASN1_type_bytes() usage.
Not sure if 0.9.8 is correct, but checked that 0.9.7m doesnt have const. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965311 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--modules/ssl/ssl_engine_vars.c2
-rw-r--r--modules/ssl/ssl_toolkit_compat.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 48d46eeefb..2b14198c21 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -785,7 +785,7 @@ void modssl_var_extract_dns(apr_table_t *t, SSL *ssl, apr_pool_t *p)
* success and writes the string to the given bio. */
static int dump_extn_value(BIO *bio, ASN1_OCTET_STRING *str)
{
- unsigned char *pp = str->data;
+ MODSSL_D2I_ASN1_type_bytes_CONST unsigned char *pp = str->data;
ASN1_STRING *ret = ASN1_STRING_new();
int rv = 0;
diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 276db45d76..e87361b7ff 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -115,9 +115,11 @@
#endif
#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
+# define MODSSL_D2I_ASN1_type_bytes_CONST const
# define MODSSL_D2I_PrivateKey_CONST const
# define MODSSL_D2I_X509_CONST const
#else
+# define MODSSL_D2I_ASN1_type_bytes_CONST
# define MODSSL_D2I_PrivateKey_CONST
# define MODSSL_D2I_X509_CONST
#endif