diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/bn/bn_blind.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/bn/bn_local.h | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_eay.c | 12 | 
3 files changed, 12 insertions, 12 deletions
| diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c index fad103705f..93a64dbfed 100644 --- a/src/lib/libcrypto/bn/bn_blind.c +++ b/src/lib/libcrypto/bn/bn_blind.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_blind.c,v 1.29 2023/08/02 08:39:04 tb Exp $ */ | 1 | /* $OpenBSD: bn_blind.c,v 1.30 2023/08/02 08:44:38 tb Exp $ */ | 
| 2 | /* ==================================================================== | 2 | /* ==================================================================== | 
| 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -215,7 +215,7 @@ err: | |||
| 215 | } | 215 | } | 
| 216 | 216 | ||
| 217 | int | 217 | int | 
| 218 | BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | 218 | BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | 
| 219 | { | 219 | { | 
| 220 | int ret = 1; | 220 | int ret = 1; | 
| 221 | 221 | ||
| @@ -243,7 +243,7 @@ BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | |||
| 243 | } | 243 | } | 
| 244 | 244 | ||
| 245 | int | 245 | int | 
| 246 | BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | 246 | BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *ctx) | 
| 247 | { | 247 | { | 
| 248 | int ret; | 248 | int ret; | 
| 249 | 249 | ||
| diff --git a/src/lib/libcrypto/bn/bn_local.h b/src/lib/libcrypto/bn/bn_local.h index 81636d413e..9447ed4f4c 100644 --- a/src/lib/libcrypto/bn/bn_local.h +++ b/src/lib/libcrypto/bn/bn_local.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_local.h,v 1.31 2023/08/02 08:39:04 tb Exp $ */ | 1 | /* $OpenBSD: bn_local.h,v 1.32 2023/08/02 08:44:38 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 | * | 
| @@ -292,8 +292,8 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, | |||
| 292 | BN_RECP_CTX *recp, BN_CTX *ctx); | 292 | BN_RECP_CTX *recp, BN_CTX *ctx); | 
| 293 | 293 | ||
| 294 | void BN_BLINDING_free(BN_BLINDING *b); | 294 | void BN_BLINDING_free(BN_BLINDING *b); | 
| 295 | int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *); | 295 | int BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *); | 
| 296 | int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *); | 296 | int BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *); | 
| 297 | 297 | ||
| 298 | CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *); | 298 | CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *); | 
| 299 | BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, | 299 | BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b, | 
| diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c index f6b1d65553..cd0ff9730c 100644 --- a/src/lib/libcrypto/rsa/rsa_eay.c +++ b/src/lib/libcrypto/rsa/rsa_eay.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_eay.c,v 1.62 2023/07/08 12:26:45 beck Exp $ */ | 1 | /* $OpenBSD: rsa_eay.c,v 1.63 2023/08/02 08:44:38 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 | * | 
| @@ -282,7 +282,7 @@ rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) | |||
| 282 | * Local blinding: store the unblinding factor | 282 | * Local blinding: store the unblinding factor | 
| 283 | * in BN_BLINDING. | 283 | * in BN_BLINDING. | 
| 284 | */ | 284 | */ | 
| 285 | return BN_BLINDING_convert_ex(f, NULL, b, ctx); | 285 | return BN_BLINDING_convert(f, NULL, b, ctx); | 
| 286 | else { | 286 | else { | 
| 287 | /* | 287 | /* | 
| 288 | * Shared blinding: store the unblinding factor | 288 | * Shared blinding: store the unblinding factor | 
| @@ -290,7 +290,7 @@ rsa_blinding_convert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) | |||
| 290 | */ | 290 | */ | 
| 291 | int ret; | 291 | int ret; | 
| 292 | CRYPTO_w_lock(CRYPTO_LOCK_RSA_BLINDING); | 292 | CRYPTO_w_lock(CRYPTO_LOCK_RSA_BLINDING); | 
| 293 | ret = BN_BLINDING_convert_ex(f, unblind, b, ctx); | 293 | ret = BN_BLINDING_convert(f, unblind, b, ctx); | 
| 294 | CRYPTO_w_unlock(CRYPTO_LOCK_RSA_BLINDING); | 294 | CRYPTO_w_unlock(CRYPTO_LOCK_RSA_BLINDING); | 
| 295 | return ret; | 295 | return ret; | 
| 296 | } | 296 | } | 
| @@ -300,14 +300,14 @@ static int | |||
| 300 | rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) | 300 | rsa_blinding_invert(BN_BLINDING *b, BIGNUM *f, BIGNUM *unblind, BN_CTX *ctx) | 
| 301 | { | 301 | { | 
| 302 | /* | 302 | /* | 
| 303 | * For local blinding, unblind is set to NULL, and BN_BLINDING_invert_ex | 303 | * For local blinding, unblind is set to NULL, and BN_BLINDING_invert() | 
| 304 | * will use the unblinding factor stored in BN_BLINDING. | 304 | * will use the unblinding factor stored in BN_BLINDING. | 
| 305 | * If BN_BLINDING is shared between threads, unblind must be non-null: | 305 | * If BN_BLINDING is shared between threads, unblind must be non-null: | 
| 306 | * BN_BLINDING_invert_ex will then use the local unblinding factor, | 306 | * BN_BLINDING_invert() will then use the local unblinding factor, | 
| 307 | * and will only read the modulus from BN_BLINDING. | 307 | * and will only read the modulus from BN_BLINDING. | 
| 308 | * In both cases it's safe to access the blinding without a lock. | 308 | * In both cases it's safe to access the blinding without a lock. | 
| 309 | */ | 309 | */ | 
| 310 | return BN_BLINDING_invert_ex(f, unblind, b, ctx); | 310 | return BN_BLINDING_invert(f, unblind, b, ctx); | 
| 311 | } | 311 | } | 
| 312 | 312 | ||
| 313 | /* signing */ | 313 | /* signing */ | 
