From: PIums Date: Wed, 4 Sep 2024 02:37:11 +0000 (-0400) Subject: argon2: Fixed an thread availability error string X-Git-Tag: openssl-3.5.0-alpha1~1172 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60725f8511fc96043f1ee5cbbe81c3fce2b2c828;p=thirdparty%2Fopenssl.git argon2: Fixed an thread availability error string Correctly display the number of requested threads and the number of available threads. CLA: trivial Reviewed-by: Paul Dale Reviewed-by: Viktor Dukhovni Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25375) --- diff --git a/providers/implementations/kdfs/argon2.c b/providers/implementations/kdfs/argon2.c index fe84ab54cad..6acf47fb1a9 100644 --- a/providers/implementations/kdfs/argon2.c +++ b/providers/implementations/kdfs/argon2.c @@ -1071,8 +1071,8 @@ static int kdf_argon2_derive(void *vctx, unsigned char *out, size_t outlen, # else if (ctx->threads > ossl_get_avail_threads(ctx->libctx)) { ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_THREAD_POOL_SIZE, - "requested %u threads, available: 1", - ossl_get_avail_threads(ctx->libctx)); + "requested %u threads, available: %u", + ctx->threads, ossl_get_avail_threads(ctx->libctx)); return 0; } # endif