summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libcrypto/Symbols.list1
-rw-r--r--src/lib/libcrypto/Symbols.namespace1
-rw-r--r--src/lib/libcrypto/bn/bn.h4
-rw-r--r--src/lib/libcrypto/bn/bn_exp.c3
-rw-r--r--src/lib/libcrypto/bn/bn_local.h5
-rw-r--r--src/lib/libcrypto/hidden/openssl/bn.h3
6 files changed, 7 insertions, 10 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list
index 19f88c6917..c439138eb7 100644
--- a/src/lib/libcrypto/Symbols.list
+++ b/src/lib/libcrypto/Symbols.list
@@ -411,7 +411,6 @@ BN_mod_exp2_mont
411BN_mod_exp_mont 411BN_mod_exp_mont
412BN_mod_exp_mont_consttime 412BN_mod_exp_mont_consttime
413BN_mod_exp_mont_word 413BN_mod_exp_mont_word
414BN_mod_exp_simple
415BN_mod_inverse 414BN_mod_inverse
416BN_mod_lshift 415BN_mod_lshift
417BN_mod_lshift1 416BN_mod_lshift1
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index e97629108a..772fb1876b 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -2223,7 +2223,6 @@ _libre_BN_exp
2223_libre_BN_mod_exp_mont_consttime 2223_libre_BN_mod_exp_mont_consttime
2224_libre_BN_mod_exp_mont_word 2224_libre_BN_mod_exp_mont_word
2225_libre_BN_mod_exp2_mont 2225_libre_BN_mod_exp2_mont
2226_libre_BN_mod_exp_simple
2227_libre_BN_mask_bits 2226_libre_BN_mask_bits
2228_libre_BN_print_fp 2227_libre_BN_print_fp
2229_libre_BN_print 2228_libre_BN_print
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
index e00953ea2c..39a5180c2c 100644
--- a/src/lib/libcrypto/bn/bn.h
+++ b/src/lib/libcrypto/bn/bn.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn.h,v 1.75 2023/07/31 05:04:06 tb Exp $ */ 1/* $OpenBSD: bn.h,v 1.76 2024/03/02 09:24:59 tb Exp $ */
2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -396,8 +396,6 @@ int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
396int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1, 396int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
397 const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m, 397 const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
398 BN_CTX *ctx, BN_MONT_CTX *m_ctx); 398 BN_CTX *ctx, BN_MONT_CTX *m_ctx);
399int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
400 const BIGNUM *m, BN_CTX *ctx);
401 399
402int BN_mask_bits(BIGNUM *a, int n); 400int BN_mask_bits(BIGNUM *a, int n);
403int BN_print_fp(FILE *fp, const BIGNUM *a); 401int BN_print_fp(FILE *fp, const BIGNUM *a);
diff --git a/src/lib/libcrypto/bn/bn_exp.c b/src/lib/libcrypto/bn/bn_exp.c
index 8293ae54f9..e4e06db149 100644
--- a/src/lib/libcrypto/bn/bn_exp.c
+++ b/src/lib/libcrypto/bn/bn_exp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn_exp.c,v 1.50 2023/10/19 10:27:27 tb Exp $ */ 1/* $OpenBSD: bn_exp.c,v 1.51 2024/03/02 09:24:59 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 *
@@ -304,7 +304,6 @@ BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,
304 304
305 return ret; 305 return ret;
306} 306}
307LCRYPTO_ALIAS(BN_mod_exp_simple);
308 307
309/* BN_mod_exp_mont_consttime() stores the precomputed powers in a specific layout 308/* BN_mod_exp_mont_consttime() stores the precomputed powers in a specific layout
310 * so that accessing any of these table values shows the same access pattern as far 309 * so that accessing any of these table values shows the same access pattern as far
diff --git a/src/lib/libcrypto/bn/bn_local.h b/src/lib/libcrypto/bn/bn_local.h
index a9ce466db3..e5c4cddc92 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.38 2023/08/09 09:23:03 tb Exp $ */ 1/* $OpenBSD: bn_local.h,v 1.39 2024/03/02 09:24:59 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 *
@@ -308,6 +308,9 @@ int BN_div_ct(BIGNUM *q, BIGNUM *r, const BIGNUM *n, const BIGNUM *d,
308int BN_mod_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); 308int BN_mod_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
309int BN_mod_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); 309int BN_mod_nonct(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
310 310
311int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
312 const BIGNUM *m, BN_CTX *ctx);
313
311BIGNUM *BN_mod_inverse_ct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n, 314BIGNUM *BN_mod_inverse_ct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n,
312 BN_CTX *ctx); 315 BN_CTX *ctx);
313BIGNUM *BN_mod_inverse_nonct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n, 316BIGNUM *BN_mod_inverse_nonct(BIGNUM *ret, const BIGNUM *a, const BIGNUM *n,
diff --git a/src/lib/libcrypto/hidden/openssl/bn.h b/src/lib/libcrypto/hidden/openssl/bn.h
index 9942cf6fc7..1aa5b10d9d 100644
--- a/src/lib/libcrypto/hidden/openssl/bn.h
+++ b/src/lib/libcrypto/hidden/openssl/bn.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: bn.h,v 1.4 2023/07/29 03:13:38 tb Exp $ */ 1/* $OpenBSD: bn.h,v 1.5 2024/03/02 09:24:59 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -99,7 +99,6 @@ LCRYPTO_USED(BN_exp);
99LCRYPTO_USED(BN_mod_exp_mont_consttime); 99LCRYPTO_USED(BN_mod_exp_mont_consttime);
100LCRYPTO_USED(BN_mod_exp_mont_word); 100LCRYPTO_USED(BN_mod_exp_mont_word);
101LCRYPTO_USED(BN_mod_exp2_mont); 101LCRYPTO_USED(BN_mod_exp2_mont);
102LCRYPTO_USED(BN_mod_exp_simple);
103LCRYPTO_USED(BN_mask_bits); 102LCRYPTO_USED(BN_mask_bits);
104LCRYPTO_USED(BN_print_fp); 103LCRYPTO_USED(BN_print_fp);
105LCRYPTO_USED(BN_print); 104LCRYPTO_USED(BN_print);