From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 6 Jul 2005 14:33:10 +0000 (+0000)
Subject:   Accomodate API changes to OpenSSL 0.9.8 (now in beta).
X-Git-Tag: 2.1.7~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3068237b350e6989821768f2c3619757aab5dc46;p=apache

  Accomodate API changes to OpenSSL 0.9.8 (now in beta).

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209465 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_toolkit_compat.h b/modules/ssl/ssl_toolkit_compat.h
index 80b38cc4d9..892bf52734 100644
--- a/modules/ssl/ssl_toolkit_compat.h
+++ b/modules/ssl/ssl_toolkit_compat.h
@@ -113,6 +113,13 @@ typedef int (modssl_read_bio_cb_fn)(char*,int,int,void*);
 
 #define HAVE_SSL_X509V3_EXT_d2i
 
+#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(HAVE_SSLC)
 
 #include <bio.h>