diff options
Diffstat (limited to 'src/crypto/pkcs8/p5_pbev2.c')
| -rw-r--r-- | src/crypto/pkcs8/p5_pbev2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/crypto/pkcs8/p5_pbev2.c b/src/crypto/pkcs8/p5_pbev2.c index fec0d86..f58aae7 100644 --- a/src/crypto/pkcs8/p5_pbev2.c +++ b/src/crypto/pkcs8/p5_pbev2.c @@ -356,8 +356,7 @@ static int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, goto err; } long iterations = ASN1_INTEGER_get(pbkdf2param->iter); - if (iterations <= 0 || - (sizeof(long) > sizeof(unsigned) && iterations > (long)UINT_MAX)) { + if (iterations < 0 || iterations > UINT_MAX) { OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_BAD_ITERATION_COUNT); goto err; } @@ -368,7 +367,7 @@ static int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, } const size_t iv_len = EVP_CIPHER_CTX_iv_length(ctx); - if ((size_t) iv->value.octet_string->length != iv_len) { + if (iv->value.octet_string->length != iv_len) { OPENSSL_PUT_ERROR(PKCS8, PKCS8_R_ERROR_SETTING_CIPHER_PARAMS); goto err; } |