From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 6 Jul 2005 15:10:36 +0000 (+0000)
Subject:   Accomodate API changes to OpenSSL 0.9.8 (now in beta).
X-Git-Tag: 2.0.55~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0c63c34d6abd1655badf8823d4d4797f10bb90;p=thirdparty%2Fapache%2Fhttpd.git

  Accomodate API changes to OpenSSL 0.9.8 (now in beta).
  For all currently building platforms, this is a noop.

Submitted by: Georg v. Zezschwitz <gzv 2scale.de>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@209468 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index fc41341a442..33f88e61c99 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -99,6 +99,13 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*);
 #define HAVE_SSL_X509V3_EXT_d2i
 #endif
 
+#ifndef PEM_F_DEF_CALLBACK
+#ifdef PEM_F_PEM_DEF_CALLBACK
+/* In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */
+#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK 
+#endif
+#endif
+
 #elif defined (SSLC_VERSION_NUMBER) /* RSA */
 
 /* sslc does not support this function, OpenSSL has since 9.5.1 */