diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2005-05-25 02:54:28 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2005-05-25 02:54:28 +0000 |
| commit | 60192e96b80fd9ec0776c9db0497c066c97a7cf9 (patch) | |
| tree | ac6eef29208b263c0dd4e5064865c26739557ef9 | |
| parent | 85991994dfb111a8501b6e722b707348edd02b99 (diff) | |
| download | openssl-60192e96b80fd9ec0776c9db0497c066c97a7cf9.tar.gz | |
Handle differences between engine IDs and their dynamic library names (and
source files, for that matter) by tolerating the alternatives. It would be
preferable to also change the generated shared library names, but that will
be taken up separately.
| -rw-r--r-- | engines/e_4758_cca.c | 5 | ||||
| -rw-r--r-- | engines/e_ncipher.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/e_4758_cca.c b/engines/e_4758_cca.c index 685a6804c5..d01a037835 100644 --- a/engines/e_4758_cca.c +++ b/engines/e_4758_cca.c @@ -202,6 +202,8 @@ static RAND_METHOD ibm_4758_cca_rand = static const char *engine_4758_cca_id = "4758cca"; static const char *engine_4758_cca_name = "IBM 4758 CCA hardware engine support"; +/* Compatibility hack, the dynamic library uses this form in the path */ +static const char *engine_4758_cca_id_alt = "4758_cca"; /* engine implementation */ /*-----------------------*/ @@ -958,7 +960,8 @@ static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, int idx, #ifndef OPENSSL_NO_DYNAMIC_ENGINE static int bind_fn(ENGINE *e, const char *id) { - if(id && (strcmp(id, engine_4758_cca_id) != 0)) + if(id && (strcmp(id, engine_4758_cca_id) != 0) && + (strcmp(id, engine_4758_cca_id_alt) != 0)) return 0; if(!bind_helper(e)) return 0; diff --git a/engines/e_ncipher.c b/engines/e_ncipher.c index b5f054bb86..11ae5aec82 100644 --- a/engines/e_ncipher.c +++ b/engines/e_ncipher.c @@ -224,6 +224,8 @@ static RAND_METHOD hwcrhk_rand = /* Constants used when creating the ENGINE */ static const char *engine_hwcrhk_id = "chil"; static const char *engine_hwcrhk_name = "nCipher hardware engine support"; +/* Compatibility hack, the dynamic library uses this form in the path */ +static const char *engine_hwcrhk_id_alt = "ncipher"; /* Internal stuff for HWCryptoHook */ @@ -1343,7 +1345,8 @@ static void hwcrhk_log_message(void *logstr, const char *message) #ifndef OPENSSL_NO_DYNAMIC_ENGINE static int bind_fn(ENGINE *e, const char *id) { - if(id && (strcmp(id, engine_hwcrhk_id) != 0)) + if(id && (strcmp(id, engine_hwcrhk_id) != 0) && + (strcmp(id, engine_hwcrhk_id_alt) != 0)) return 0; if(!bind_helper(e)) return 0; |