You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2010/07/19 00:49:59 UTC
svn commit: r965311 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_vars.c
ssl_toolkit_compat.h
Author: fuankg
Date: Sun Jul 18 22:49:59 2010
New Revision: 965311
URL: http://svn.apache.org/viewvc?rev=965311&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c?rev=965311&r1=965310&r2=965311&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c Sun Jul 18 22:49:59 2010
@@ -785,7 +785,7 @@ void modssl_var_extract_dns(apr_table_t
* 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;
Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=965311&r1=965310&r2=965311&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Sun Jul 18 22:49:59 2010
@@ -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