From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 18 Jul 2010 22:49:59 +0000 (+0000)
Subject: fixed const for d2i_ASN1_type_bytes() usage.
X-Git-Tag: 2.3.7~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f27014e2947c2392cdf1067aec8dc2e658d22163;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 48d46eeefb7..2b14198c218 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 276db45d76c..e87361b7ff5 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