diff options
| author | tb <> | 2023-12-22 17:37:14 +0000 |
|---|---|---|
| committer | tb <> | 2023-12-22 17:37:14 +0000 |
| commit | 0a12792cd1c0048aa5e65830422f2b581172ff98 (patch) | |
| tree | ff91f9b9defdfa8e1654b710358120806194fa78 /src | |
| parent | b76ca7f096d956e57233cad618f288c5af4556d6 (diff) | |
| download | openbsd-0a12792cd1c0048aa5e65830422f2b581172ff98.tar.gz openbsd-0a12792cd1c0048aa5e65830422f2b581172ff98.tar.bz2 openbsd-0a12792cd1c0048aa5e65830422f2b581172ff98.zip | |
Remove two no longer necessary reminders
I guess I'm getting old. Next time I'll have to add a reminder not to
forget to remove the reminder.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/evp/evp_enc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c index d18691a4db..ec4dae03f5 100644 --- a/src/lib/libcrypto/evp/evp_enc.c +++ b/src/lib/libcrypto/evp/evp_enc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: evp_enc.c,v 1.77 2023/12/22 14:58:05 tb Exp $ */ | 1 | /* $OpenBSD: evp_enc.c,v 1.78 2023/12/22 17:37:14 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 | * |
| @@ -324,7 +324,6 @@ EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len, | |||
| 324 | if (partial_len == 0 && (in_len & block_mask) == 0) | 324 | if (partial_len == 0 && (in_len & block_mask) == 0) |
| 325 | return evp_cipher(ctx, out, out_len, in, in_len); | 325 | return evp_cipher(ctx, out, out_len, in, in_len); |
| 326 | 326 | ||
| 327 | /* XXX - check that block_size > partial_len. */ | ||
| 328 | if (partial_len < 0 || partial_len >= block_size || | 327 | if (partial_len < 0 || partial_len >= block_size || |
| 329 | block_size > sizeof(ctx->buf)) { | 328 | block_size > sizeof(ctx->buf)) { |
| 330 | EVPerror(EVP_R_BAD_BLOCK_LENGTH); | 329 | EVPerror(EVP_R_BAD_BLOCK_LENGTH); |
| @@ -400,7 +399,6 @@ EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *out_len) | |||
| 400 | if ((ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) != 0) | 399 | if ((ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) != 0) |
| 401 | return evp_cipher(ctx, out, out_len, NULL, 0); | 400 | return evp_cipher(ctx, out, out_len, NULL, 0); |
| 402 | 401 | ||
| 403 | /* XXX - check that block_size > partial_len. */ | ||
| 404 | if (partial_len < 0 || partial_len >= block_size || | 402 | if (partial_len < 0 || partial_len >= block_size || |
| 405 | block_size > sizeof(ctx->buf)) { | 403 | block_size > sizeof(ctx->buf)) { |
| 406 | EVPerror(EVP_R_BAD_BLOCK_LENGTH); | 404 | EVPerror(EVP_R_BAD_BLOCK_LENGTH); |
