summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68>2009-01-03 17:20:49 +0000
committerminfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68>2009-01-03 17:20:49 +0000
commit99ce8e90edb1fa72d39c38d7f4ef68a826937c58 (patch)
tree18de6ba69de732df4c1ed27451517c253117ff12
parentd055743019a4d0941aa4b75cf82970175b3a9ff5 (diff)
downloadlibapr-util-99ce8e90edb1fa72d39c38d7f4ef68a826937c58.tar.gz
Provide a mechanism to provide the recommended crypto driver to
calling application. git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@731027 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES3
-rw-r--r--include/apr_crypto.h19
2 files changed, 22 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 88a55835..0cea4401 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.4.0
+ *) Provide a mechanism to provide the recommended crypto driver to
+ calling application. [Graham Leggett]
+
*) Suppress pgsql column-out-of-range warning.
PR 46012 [Michiel van Loon <michiel van-loon.xs4all.nl>]
diff --git a/include/apr_crypto.h b/include/apr_crypto.h
index c8b7f6a9..2577248c 100644
--- a/include/apr_crypto.h
+++ b/include/apr_crypto.h
@@ -81,6 +81,25 @@ extern "C" {
#if APU_HAVE_CRYPTO
+#ifndef APU_CRYPTO_RECOMMENDED_DRIVER
+#if APU_HAVE_OPENSSL
+#define APU_CRYPTO_RECOMMENDED_DRIVER "openssl"
+#else
+#if APU_HAVE_NSS
+#define APU_CRYPTO_RECOMMENDED_DRIVER "nss"
+#else
+#if APU_HAVE_MSCNG
+#define APU_CRYPTO_RECOMMENDED_DRIVER "mscng"
+#else
+#if APU_HAVE_MSCAPI
+#define APU_CRYPTO_RECOMMENDED_DRIVER "mscapi"
+#else
+#endif
+#endif
+#endif
+#endif
+#endif
+
/**
* Symmetric Key types understood by the library.
*