From 2c2c35c0049fbdfba552a1b37df4e879e2a30af3 Mon Sep 17 00:00:00 2001 From: beck <> Date: Tue, 14 May 2019 15:40:44 +0000 Subject: Correct missing test to determine if length is in bytes or in bits. Issue found by Guido Vranken ok tedu@ tb@ --- src/lib/libcrypto/evp/e_des3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index 3cb95a8e22..0138839763 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_des3.c,v 1.19 2015/10/12 06:05:52 guenther Exp $ */ +/* $OpenBSD: e_des3.c,v 1.20 2019/05/14 15:40:44 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -163,6 +163,8 @@ des_ede3_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, { size_t n; unsigned char c[1], d[1]; + if (!(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS)) + inl *= 8; for (n = 0; n < inl; ++n) { c[0] = (in[n/8]&(1 << (7 - n % 8))) ? 0x80 : 0; -- cgit v1.2.3-55-g6feb