diff options
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | crypto/apr_crypto_nss.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with APR-util 1.4.0 + *) Fix a bogus initialisation of the IV size in the NSS crypto driver. + [Graham Leggett] + *) Make sure that the underlying result code during driver initialisation is exposed to the caller. [Graham Leggett] diff --git a/crypto/apr_crypto_nss.c b/crypto/apr_crypto_nss.c index 88355ca4..17dcb6de 100644 --- a/crypto/apr_crypto_nss.c +++ b/crypto/apr_crypto_nss.c @@ -421,7 +421,6 @@ static apr_status_t crypto_block_encrypt_init(apr_pool_t *p, { PRErrorCode perr; SECItem * secParam; - int usedIvSize; SECItem ivItem; unsigned char * usedIv; apr_crypto_block_t *block = *ctx; @@ -457,7 +456,7 @@ static apr_status_t crypto_block_encrypt_init(apr_pool_t *p, usedIv = (unsigned char *)*iv; } ivItem.data = usedIv; - ivItem.len = usedIvSize; + ivItem.len = key->ivSize; secParam = PK11_ParamFromIV(key->cipherMech, &ivItem); } else { |