From f0d91b4864fc73c270213de00e3394c151b7e9cc Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 2 Aug 2023 08:44:38 +0000 Subject: [PATCH] Drop the _ex from BN_BLINDING_{convert,invert}_ex() --- lib/libcrypto/bn/bn_blind.c | 6 +++--- lib/libcrypto/bn/bn_local.h | 6 +++--- lib/libcrypto/rsa/rsa_eay.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/libcrypto/bn/bn_blind.c b/lib/libcrypto/bn/bn_blind.c index fad103705fc..93a64dbfed9 100644 --- a/lib/libcrypto/bn/bn_blind.c +++ b/lib/libcrypto/bn/bn_blind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_blind.c,v 1.29 2023/08/02 08:39:04 tb Exp $ */ +/* $OpenBSD: bn_blind.c,v 1.30 2023/08/02 08:44:38 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -215,7 +215,7 @@ err: } int -BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) +BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) { int ret = 1; @@ -243,7 +243,7 @@ BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) } int -BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) +BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) { int ret; diff --git a/lib/libcrypto/bn/bn_local.h b/lib/libcrypto/bn/bn_local.h index 81636d413e8..9447ed4f4c2 100644 --- a/lib/libcrypto/bn/bn_local.h +++ b/lib/libcrypto/bn/bn_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn_local.h,v 1.31 2023/08/02 08:39:04 tb Exp $ */ +/* $OpenBSD: bn_local.h,v 1.32 2023/08/02 08:44:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -292,8 +292,8 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, BN_RECP_CTX *recp, BN_CTX *ctx); void BN_BLINDING_free(BN_BLINDING *b); -int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *); -int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *); +int BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *); +int BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *); CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *); BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, diff --git a/lib/libcrypto/rsa/rsa_eay.c b/lib/libcrypto/rsa/rsa_eay.c index f6b1d655531..cd0ff9730c0 100644 --- a/lib/libcrypto/rsa/rsa_eay.c +++ b/lib/libcrypto/rsa/rsa_eay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_eay.c,v 1.62 2023/07/08 12:26:45 beck Exp $ */ +/* $OpenBSD: rsa_eay.c,v 1.63 2023/08/02 08:44:38 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -282,7 +282,7 @@ rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) * Local blinding: store the unblinding factor * in BN_BLINDING. */ - return BN_BLINDING_convert_ex(f, NULL, b, ctx); + return BN_BLINDING_convert(f, NULL, b, ctx); else { /* * Shared blinding: store the unblinding factor @@ -290,7 +290,7 @@ rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) */ int ret; CRYPTO_w_lock(CRYPTO_LOCK_RSA_BLINDING); - ret = BN_BLINDING_convert_ex(f, unblind, b, ctx); + ret = BN_BLINDING_convert(f, unblind, b, ctx); CRYPTO_w_unlock(CRYPTO_LOCK_RSA_BLINDING); return ret; } @@ -300,14 +300,14 @@ static int rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) { /* - * For local blinding, unblind is set to NULL, and BN_BLINDING_invert_ex + * For local blinding, unblind is set to NULL, and BN_BLINDING_invert() * will use the unblinding factor stored in BN_BLINDING. * If BN_BLINDING is shared between threads, unblind must be non-null: - * BN_BLINDING_invert_ex will then use the local unblinding factor, + * BN_BLINDING_invert() will then use the local unblinding factor, * and will only read the modulus from BN_BLINDING. * In both cases it's safe to access the blinding without a lock. */ - return BN_BLINDING_invert_ex(f, unblind, b, ctx); + return BN_BLINDING_invert(f, unblind, b, ctx); } /* signing */ -- 2.20.1