diff options
Diffstat (limited to 'src/lib/libcrypto/evp/e_rc2.c')
-rw-r--r-- | src/lib/libcrypto/evp/e_rc2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c index 9052195ac2..de1b24a306 100644 --- a/src/lib/libcrypto/evp/e_rc2.c +++ b/src/lib/libcrypto/evp/e_rc2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: e_rc2.c,v 1.11 2015/02/10 09:52:35 miod Exp $ */ | 1 | /* $OpenBSD: e_rc2.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -171,7 +171,7 @@ rc2_magic_to_meth(int i) | |||
171 | else if (i == RC2_40_MAGIC) | 171 | else if (i == RC2_40_MAGIC) |
172 | return 40; | 172 | return 40; |
173 | else { | 173 | else { |
174 | EVPerr(EVP_F_RC2_MAGIC_TO_METH, EVP_R_UNSUPPORTED_KEY_SIZE); | 174 | EVPerror(EVP_R_UNSUPPORTED_KEY_SIZE); |
175 | return (0); | 175 | return (0); |
176 | } | 176 | } |
177 | } | 177 | } |
@@ -188,8 +188,7 @@ rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) | |||
188 | if (type != NULL) { | 188 | if (type != NULL) { |
189 | l = EVP_CIPHER_CTX_iv_length(c); | 189 | l = EVP_CIPHER_CTX_iv_length(c); |
190 | if (l > sizeof(iv)) { | 190 | if (l > sizeof(iv)) { |
191 | EVPerr(EVP_F_RC2_GET_ASN1_TYPE_AND_IV, | 191 | EVPerror(EVP_R_IV_TOO_LARGE); |
192 | EVP_R_IV_TOO_LARGE); | ||
193 | return -1; | 192 | return -1; |
194 | } | 193 | } |
195 | i = ASN1_TYPE_get_int_octetstring(type, &num, iv, l); | 194 | i = ASN1_TYPE_get_int_octetstring(type, &num, iv, l); |