svn commit: r1629519 - in /httpd/httpd/trunk/modules/ssl: ssl_private.h ssl_util_stapling.c

[y***@apache.org]

Author: ylavic
Date: Sun Oct 5 18:36:02 2014
New Revision: 1629519

URL: http://svn.apache.org/r1629519
Log:
Follow up to r1629372 and r1629485: ensure compatibily with OpenSSL < 1.0 (sk_OPENSSL_STRING_[num|value|pop] macros).

Modified:
httpd/httpd/trunk/modules/ssl/ssl_private.h
httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1629519&r1=1629518&r2=1629519&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Sun Oct 5 18:36:02 2014
@@ -151,6 +151,13 @@
/* OCSP stapling */
#if !defined(OPENSSL_NO_OCSP) && defined(SSL_CTX_set_tlsext_status_cb)
#define HAVE_OCSP_STAPLING
+/* backward compatibility with OpenSSL < 1.0 */
+#ifndef sk_OPENSSL_STRING_num
+#define sk_OPENSSL_STRING_num sk_num
+#endif
+#ifndef sk_OPENSSL_STRING_value
+#define sk_OPENSSL_STRING_value sk_value
+#endif
#ifndef sk_OPENSSL_STRING_pop
#define sk_OPENSSL_STRING_pop sk_pop
#endif

Modified: httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c?rev=1629519&r1=1629518&r2=1629519&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_stapling.c Sun Oct 5 18:36:02 2014
@@ -32,11 +32,6 @@
#include "ap_mpm.h"
#include "apr_thread_mutex.h"

-#ifndef sk_OPENSSL_STRING_value
-/* backward compatibility with OpenSSL < 1.0 */
-#define sk_OPENSSL_STRING_value sk_value
-#endif
-
#ifdef HAVE_OCSP_STAPLING

/**