Revert r1833421 et al:
Move commoncrypto initialisation back to
apr_crypto_commoncrypto module, reinstate DSO support.
Remove noop references to mscapi and mscng.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1861892 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/crypto/apr_crypto.c b/crypto/apr_crypto.c
index b6fe413..f41bc35 100644
--- a/crypto/apr_crypto.c
+++ b/crypto/apr_crypto.c
@@ -393,27 +393,6 @@
}
else
#endif
-#if APU_HAVE_COMMONCRYPTO
- if (!strcmp(name, "commoncrypto")) {
- *version = apr__crypto_commoncrypto_version();
- rv = *version ? APR_SUCCESS : APR_NOTFOUND;
- }
- else
-#endif
-#if APU_HAVE_MSCAPI
- if (!strcmp(name, "mscapi")) {
- *version = apr__crypto_mscapi_version();
- rv = *version ? APR_SUCCESS : APR_NOTFOUND;
- }
- else
-#endif
-#if APU_HAVE_MSCNG
- if (!strcmp(name, "mscng")) {
- *version = apr__crypto_mscng_version();
- rv = *version ? APR_SUCCESS : APR_NOTFOUND;
- }
- else
-#endif
;
return rv;
}
@@ -482,36 +461,6 @@
}
else
#endif
-#if APU_HAVE_COMMONCRYPTO
- if (!strcmp(name, "commoncrypto")) {
- rv = apr__crypto_commoncrypto_init(params, result, pool);
- if (rv == APR_SUCCESS) {
- lib->term = apr__crypto_commoncrypto_term;
- lib->name = "commoncrypto";
- }
- }
- else
-#endif
-#if APU_HAVE_MSCAPI
- if (!strcmp(name, "mscapi")) {
- rv = apr__crypto_mscapi_init(params, result, pool);
- if (rv == APR_SUCCESS) {
- lib->term = apr__crypto_mscapi_term;
- lib->name = "mscapi";
- }
- }
- else
-#endif
-#if APU_HAVE_MSCNG
- if (!strcmp(name, "mscng")) {
- rv = apr__crypto_mscng_init(params, result, pool);
- if (rv == APR_SUCCESS) {
- lib->term = apr__crypto_mscng_term;
- lib->name = "mscng";
- }
- }
- else
-#endif
;
if (rv == APR_SUCCESS) {
lib->pool = pool;
@@ -553,24 +502,6 @@
}
else
#endif
-#if APU_HAVE_COMMONCRYPTO
- if (!strcmp(name, "commoncrypto")) {
- rv = APR_SUCCESS;
- }
- else
-#endif
-#if APU_HAVE_MSCAPI
- if (!strcmp(name, "mscapi")) {
- rv = APR_SUCCESS;
- }
- else
-#endif
-#if APU_HAVE_MSCNG
- if (!strcmp(name, "mscng")) {
- rv = APR_SUCCESS;
- }
- else
-#endif
;
if (rv == APR_SUCCESS) {
apr_pool_cleanup_kill(lib->pool, lib, crypto_lib_cleanup);
diff --git a/crypto/apr_crypto_commoncrypto.c b/crypto/apr_crypto_commoncrypto.c
index 903371a..2e61795 100644
--- a/crypto/apr_crypto_commoncrypto.c
+++ b/crypto/apr_crypto_commoncrypto.c
@@ -123,7 +123,7 @@
*/
static apr_status_t crypto_shutdown(void)
{
- return apr_crypto_lib_term("commoncrypto");
+ return APR_SUCCESS;
}
/**
@@ -132,7 +132,7 @@
static apr_status_t crypto_init(apr_pool_t *pool, const char *params,
const apu_err_t **result)
{
- return apr_crypto_lib_init("commoncrypto", params, result, pool);
+ return APR_SUCCESS;
}
/**
diff --git a/crypto/apr_crypto_internal.c b/crypto/apr_crypto_internal.c
index ecec5a4..fda8924 100644
--- a/crypto/apr_crypto_internal.c
+++ b/crypto/apr_crypto_internal.c
@@ -487,70 +487,4 @@
#endif /* APU_HAVE_NSS */
-
-#if APU_HAVE_COMMONCRYPTO
-
-const char *apr__crypto_commoncrypto_version(void)
-{
- return NULL;
-}
-
-apr_status_t apr__crypto_commoncrypto_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool)
-{
- return APR_SUCCESS;
-}
-
-apr_status_t apr__crypto_commoncrypto_term(void)
-{
- return APR_SUCCESS;
-}
-
-#endif /* APU_HAVE_COMMONCRYPTO */
-
-
-#if APU_HAVE_MSCAPI
-
-const char *apr__crypto_mscapi_version(void)
-{
- return NULL;
-}
-
-apr_status_t apr__crypto_mscapi_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool)
-{
- return APR_ENOTIMPL;
-}
-
-apr_status_t apr__crypto_mscapi_term(void)
-{
- return APR_ENOTIMPL;
-}
-
-#endif /* APU_HAVE_MSCAPI */
-
-
-#if APU_HAVE_MSCNG
-
-const char *apr__crypto_mscng_version(void)
-{
- return NULL;
-}
-
-apr_status_t apr__crypto_mscng_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool)
-{
- return APR_ENOTIMPL;
-}
-
-apr_status_t apr__crypto_mscng_term(void)
-{
- return APR_ENOTIMPL;
-}
-
-#endif /* APU_HAVE_MSCNG */
-
#endif /* APU_HAVE_CRYPTO */
diff --git a/include/private/apr_crypto_internal.h b/include/private/apr_crypto_internal.h
index f300caa..8e54b78 100644
--- a/include/private/apr_crypto_internal.h
+++ b/include/private/apr_crypto_internal.h
@@ -436,30 +436,6 @@
apr_status_t apr__crypto_nss_term(void);
#endif
-#if APU_HAVE_COMMONCRYPTO
-const char *apr__crypto_commoncrypto_version(void);
-apr_status_t apr__crypto_commoncrypto_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool);
-apr_status_t apr__crypto_commoncrypto_term(void);
-#endif
-
-#if APU_HAVE_MSCAPI
-const char *apr__crypto_mscapi_version(void);
-apr_status_t apr__crypto_mscapi_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool);
-apr_status_t apr__crypto_mscapi_term(void);
-#endif
-
-#if APU_HAVE_MSCNG
-const char *apr__crypto_mscng_version(void);
-apr_status_t apr__crypto_mscng_init(const char *params,
- const apu_err_t **result,
- apr_pool_t *pool);
-apr_status_t apr__crypto_mscng_term(void);
-#endif
-
#endif
#ifdef __cplusplus
