diff options
| author | tb <> | 2023-12-02 19:06:22 +0000 |
|---|---|---|
| committer | tb <> | 2023-12-02 19:06:22 +0000 |
| commit | f2eb70aabb14a42983ceb8612a3320f7ed8ac943 (patch) | |
| tree | 1b928e03cc6db4fc25d3e8d5a23cc90df3090d0f /src | |
| parent | 274200c32ee320eb0f58a1c3d53265bbbdd12292 (diff) | |
| download | openbsd-f2eb70aabb14a42983ceb8612a3320f7ed8ac943.tar.gz openbsd-f2eb70aabb14a42983ceb8612a3320f7ed8ac943.tar.bz2 openbsd-f2eb70aabb14a42983ceb8612a3320f7ed8ac943.zip | |
Revert a hunk of r1.23 that makes no sense
The commit was about checking EVP_CIPHER_CTX_iv_length(), but the function
called here is EVP_CIPHER_CTX_key_length(). The result of the computation
is still correct, the check and local variable simply make no sense.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/evp/e_rc2.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c index 202abc69c1..d859ad2a15 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.24 2023/11/18 10:46:58 tb Exp $ */ | 1 | /* $OpenBSD: e_rc2.c,v 1.25 2023/12/02 19:06:22 tb 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 | * |
| @@ -383,15 +383,9 @@ rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type) | |||
| 383 | static int | 383 | static int |
| 384 | rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) | 384 | rc2_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr) |
| 385 | { | 385 | { |
| 386 | int iv_len; | ||
| 387 | |||
| 388 | switch (type) { | 386 | switch (type) { |
| 389 | case EVP_CTRL_INIT: | 387 | case EVP_CTRL_INIT: |
| 390 | data(c)->key_bits = 0; | 388 | data(c)->key_bits = EVP_CIPHER_CTX_key_length(c) * 8; |
| 391 | /* XXX - upper bound? */ | ||
| 392 | if ((iv_len = EVP_CIPHER_CTX_key_length(c)) < 0) | ||
| 393 | return -1; | ||
| 394 | data(c)->key_bits = iv_len * 8; | ||
| 395 | return 1; | 389 | return 1; |
| 396 | 390 | ||
| 397 | case EVP_CTRL_GET_RC2_KEY_BITS: | 391 | case EVP_CTRL_GET_RC2_KEY_BITS: |
