diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2020-05-24 16:14:02 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-10-06 15:18:10 +0200 |
| commit | 64da15c40d15aac58e211fd25d00e9ae84d0379b (patch) | |
| tree | 8ce1618944534f5984958bb725b9ac86715c249d /ssl/tls_depr.c | |
| parent | Remove OPENSSL_ia32cap overrides in various test scripts (diff) | |
| download | openssl-64da15c40d15aac58e211fd25d00e9ae84d0379b.tar.xz openssl-64da15c40d15aac58e211fd25d00e9ae84d0379b.zip | |
Replace the AES-128-CBC-HMAC-SHA1 cipher in e_ossltest.c
This replaces the AES-128-CBC-HMAC-SHA1 cipher with a
non-encrypting version for use the test suite.
[extended tests]
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16693)
Diffstat (limited to 'ssl/tls_depr.c')
| -rw-r--r-- | ssl/tls_depr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ssl/tls_depr.c b/ssl/tls_depr.c index 0b21ff7669..1761ba1d8e 100644 --- a/ssl/tls_depr.c +++ b/ssl/tls_depr.c @@ -27,6 +27,7 @@ void tls_engine_finish(ENGINE *e) const EVP_CIPHER *tls_get_cipher_from_engine(int nid) { + const EVP_CIPHER *ret = NULL; #ifndef OPENSSL_NO_ENGINE ENGINE *eng; @@ -36,15 +37,16 @@ const EVP_CIPHER *tls_get_cipher_from_engine(int nid) */ eng = ENGINE_get_cipher_engine(nid); if (eng != NULL) { + ret = ENGINE_get_cipher(eng, nid); ENGINE_finish(eng); - return EVP_get_cipherbynid(nid); } #endif - return NULL; + return ret; } const EVP_MD *tls_get_digest_from_engine(int nid) { + const EVP_MD *ret = NULL; #ifndef OPENSSL_NO_ENGINE ENGINE *eng; @@ -54,11 +56,11 @@ const EVP_MD *tls_get_digest_from_engine(int nid) */ eng = ENGINE_get_digest_engine(nid); if (eng != NULL) { + ret = ENGINE_get_digest(eng, nid); ENGINE_finish(eng); - return EVP_get_digestbynid(nid); } #endif - return NULL; + return ret; } #ifndef OPENSSL_NO_ENGINE |