www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity

The macro is simply not worth it; each of these various occurances

Browse Source 
differ as openssl has modified pointer constness from bump to bump.

  This needs testing on Netware, it builds clean on 0.9.6m, 0.9.7d,
  0.9.7g, and 0.9.8-final on Win32.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209675 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2005-07-07 23:47:05 +00:00
parent 9e3b533975
commit 3e2a9469ce
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/ssl/ssl_engine_init.c
View File

@@ -719,7 +719,12 @@ static int ssl_server_import_cert(server_rec *s,
{
SSLModConfigRec *mc = myModConfig(s);
ssl_asn1_t *asn1;
unsigned char *ptr;
#ifdef OPENSSL_VERSION_NUMBER
#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
const /* ...shifting sands of openssl... */
#endif
#endif
unsigned char *ptr;
const char *type = ssl_asn1_keystr(idx);
X509 *cert;
@@ -757,7 +762,12 @@ static int ssl_server_import_key(server_rec *s,
{
SSLModConfigRec *mc = myModConfig(s);
ssl_asn1_t *asn1;
unsigned char *ptr;
#ifdef OPENSSL_VERSION_NUMBER
#if (OPENSSL_VERSION_NUMBER >= 0x00908000)
const /* ...shifting sands of openssl... */
#endif
#endif
unsigned char *ptr;
const char *type = ssl_asn1_keystr(idx);
int pkey_type = (idx == SSL_AIDX_RSA) ? EVP_PKEY_RSA : EVP_PKEY_DSA;
EVP_PKEY *pkey;