You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2019/06/22 23:35:41 UTC
svn commit: r1861892 - in /apr/apr/trunk: crypto/apr_crypto.c
crypto/apr_crypto_commoncrypto.c crypto/apr_crypto_internal.c
include/private/apr_crypto_internal.h
Author: minfrin
Date: Sat Jun 22 23:35:41 2019
New Revision: 1861892
URL: http://svn.apache.org/viewvc?rev=1861892&view=rev
Log:
Revert r1833421 et al:
Move commoncrypto initialisation back to
apr_crypto_commoncrypto module, reinstate DSO support.
Remove noop references to mscapi and mscng.
Modified:
apr/apr/trunk/crypto/apr_crypto.c
apr/apr/trunk/crypto/apr_crypto_commoncrypto.c
apr/apr/trunk/crypto/apr_crypto_internal.c
apr/apr/trunk/include/private/apr_crypto_internal.h
Modified: apr/apr/trunk/crypto/apr_crypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto.c?rev=1861892&r1=1861891&r2=1861892&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto.c Sat Jun 22 23:35:41 2019
@@ -393,27 +393,6 @@ APR_DECLARE(apr_status_t) apr_crypto_lib
}
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 @@ APR_DECLARE(apr_status_t) apr_crypto_lib
}
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;
@@ -552,24 +501,6 @@ static apr_status_t crypto_lib_term(cons
rv = APR_SUCCESS;
}
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) {
Modified: apr/apr/trunk/crypto/apr_crypto_commoncrypto.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_commoncrypto.c?rev=1861892&r1=1861891&r2=1861892&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_commoncrypto.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_commoncrypto.c Sat Jun 22 23:35:41 2019
@@ -123,7 +123,7 @@ static apr_status_t crypto_error(const a
*/
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_shutdown(void
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;
}
/**
Modified: apr/apr/trunk/crypto/apr_crypto_internal.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_crypto_internal.c?rev=1861892&r1=1861891&r2=1861892&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_crypto_internal.c (original)
+++ apr/apr/trunk/crypto/apr_crypto_internal.c Sat Jun 22 23:35:41 2019
@@ -487,70 +487,4 @@ apr_status_t apr__crypto_nss_term(void)
#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 */
Modified: apr/apr/trunk/include/private/apr_crypto_internal.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/private/apr_crypto_internal.h?rev=1861892&r1=1861891&r2=1861892&view=diff
==============================================================================
--- apr/apr/trunk/include/private/apr_crypto_internal.h (original)
+++ apr/apr/trunk/include/private/apr_crypto_internal.h Sat Jun 22 23:35:41 2019
@@ -436,30 +436,6 @@ apr_status_t apr__crypto_nss_init(const
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