summaryrefslogtreecommitdiffstats
path: root/modules/ssl/ssl_private.h
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2012-06-10 21:50:25 +0200
committerStefan Fritsch <sf@apache.org>2012-06-10 21:50:25 +0200
commit6dd8ce1c333ce0d9049fc81242336b3a30e2794a (patch)
tree46189b625f8eb73c337f1109f61bf4e943b09ff8 /modules/ssl/ssl_private.h
parentUpdates. (diff)
downloadapache2-6dd8ce1c333ce0d9049fc81242336b3a30e2794a.tar.xz
apache2-6dd8ce1c333ce0d9049fc81242336b3a30e2794a.zip
Add some improvements as suggested by Kaspar
- expand comment in config file - check username == NULL - detect SRP support via SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB, not via openssl version - rename rv variable git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1348653 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--modules/ssl/ssl_private.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index e04c933da9..5a0373d937 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -186,10 +186,12 @@
#endif
/* SRP support came in OpenSSL 1.0.1 */
-#if (OPENSSL_VERSION_NUMBER < 0x10001000)
-#define OPENSSL_NO_SRP
-#else
+#ifndef OPENSSL_NO_SRP
+#ifdef SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB
#include <openssl/srp.h>
+#else
+#define OPENSSL_NO_SRP
+#endif
#endif
/* mod_ssl headers */