diff options
| author | Matt Caswell <matt@openssl.org> | 2016-06-10 16:51:39 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-06-13 17:38:39 +0100 |
| commit | d356dc561925ec9cecc58a69e2280c18a49ec41a (patch) | |
| tree | 3c6310c4182f1faf43e09f8a71c1fd0ceab36607 /crypto/evp/e_rc2.c | |
| parent | c887104f4ac27a2743c0c830d20c1e341180a48b (diff) | |
Add some missing return value checks
Some misc return value checks
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/evp/e_rc2.c')
| -rw-r--r-- | crypto/evp/e_rc2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/evp/e_rc2.c b/crypto/evp/e_rc2.c index 8286424bb5..ed10bb3324 100644 --- a/crypto/evp/e_rc2.c +++ b/crypto/evp/e_rc2.c @@ -130,16 +130,17 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) OPENSSL_assert(l <= sizeof(iv)); i = ASN1_TYPE_get_int_octetstring(type, &num, iv, l); if (i != (int)l) - return (-1); + return -1; key_bits = rc2_magic_to_meth((int)num); if (!key_bits) - return (-1); + return -1; if (i > 0 && !EVP_CipherInit_ex(c, NULL, NULL, NULL, iv, -1)) return -1; EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_RC2_KEY_BITS, key_bits, NULL); - EVP_CIPHER_CTX_set_key_length(c, key_bits / 8); + if (EVP_CIPHER_CTX_set_key_length(c, key_bits / 8) <= 0) + return -1; } - return (i); + return i; } static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) |