diff options
| author | Graham Leggett <minfrin@apache.org> | 2018-08-27 11:27:43 +0000 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2018-08-27 11:27:43 +0000 |
| commit | 1b9513da4685c84f63fefc13c705b48c0354a4eb (patch) | |
| tree | 2e368fbcfff273e76c23c4b48e3efe131331abdc /crypto | |
| parent | 5a7b0deafd28086d02de3783bb7937f5df1d26f3 (diff) | |
| download | apr-1b9513da4685c84f63fefc13c705b48c0354a4eb.tar.gz | |
Remove an unnecessary cipher lookup in the HMAC case.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1839296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/apr_crypto_commoncrypto.c | 6 | ||||
| -rw-r--r-- | crypto/apr_crypto_nss.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/crypto/apr_crypto_commoncrypto.c b/crypto/apr_crypto_commoncrypto.c index 421b0581a..df8b7e77e 100644 --- a/crypto/apr_crypto_commoncrypto.c +++ b/crypto/apr_crypto_commoncrypto.c @@ -566,12 +566,6 @@ static apr_status_t crypto_key(apr_crypto_key_t **k, } case APR_CRYPTO_KTYPE_HMAC: { - /* decide on what cipher mechanism we will be using */ - rv = crypto_cipher_mechanism(key, rec->type, rec->mode, rec->pad, p); - if (APR_SUCCESS != rv) { - return rv; - } - /* decide on what digest mechanism we will be using */ rv = crypto_digest_mechanism(key, rec->k.hmac.digest, p); if (APR_SUCCESS != rv) { diff --git a/crypto/apr_crypto_nss.c b/crypto/apr_crypto_nss.c index 59955b2fa..223da9eb5 100644 --- a/crypto/apr_crypto_nss.c +++ b/crypto/apr_crypto_nss.c @@ -644,12 +644,6 @@ static apr_status_t crypto_key(apr_crypto_key_t **k, } case APR_CRYPTO_KTYPE_HMAC: { - /* decide on what cipher mechanism we will be using */ - rv = crypto_cipher_mechanism(key, rec->type, rec->mode, rec->pad); - if (APR_SUCCESS != rv) { - return rv; - } - switch (rec->k.hmac.digest) { case APR_CRYPTO_DIGEST_MD5: key->hashMech = CKM_MD5_HMAC; |