summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bn
diff options
context:
space:
mode:
authortb <>2023-08-09 09:23:03 +0000
committertb <>2023-08-09 09:23:03 +0000
commitfb26e3d813e4ccd04c6d557d46d14abf011c4641 (patch)
tree797f17896c37c12a04247ce5f49fb5c828bb2f3d /src/lib/libcrypto/bn
parent41d4e0ff7ca56d4526056b45876cfa80a4d37e4a (diff)
downloadopenbsd-fb26e3d813e4ccd04c6d557d46d14abf011c4641.tar.gz
openbsd-fb26e3d813e4ccd04c6d557d46d14abf011c4641.tar.bz2
openbsd-fb26e3d813e4ccd04c6d557d46d14abf011c4641.zip
Move bn_blind.c to rsa_blinding.c
discussed with jsing
Diffstat (limited to 'src/lib/libcrypto/bn')
-rw-r--r--src/lib/libcrypto/bn/bn_blind.c259
-rw-r--r--src/lib/libcrypto/bn/bn_local.h10
2 files changed, 1 insertions, 268 deletions
diff --git a/src/lib/libcrypto/bn/bn_blind.c b/src/lib/libcrypto/bn/bn_blind.c
deleted file mode 100644
index 1d0835b27f..0000000000
--- a/src/lib/libcrypto/bn/bn_blind.c
+++ /dev/null
@@ -1,259 +0,0 @@
1/* $OpenBSD: bn_blind.c,v 1.43 2023/08/09 09:20:00 tb Exp $ */
2/* ====================================================================
3 * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 *
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in
14 * the documentation and/or other materials provided with the
15 * distribution.
16 *
17 * 3. All advertising materials mentioning features or use of this
18 * software must display the following acknowledgment:
19 * "This product includes software developed by the OpenSSL Project
20 * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
21 *
22 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
23 * endorse or promote products derived from this software without
24 * prior written permission. For written permission, please contact
25 * openssl-core@openssl.org.
26 *
27 * 5. Products derived from this software may not be called "OpenSSL"
28 * nor may "OpenSSL" appear in their names without prior written
29 * permission of the OpenSSL Project.
30 *
31 * 6. Redistributions of any form whatsoever must retain the following
32 * acknowledgment:
33 * "This product includes software developed by the OpenSSL Project
34 * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
35 *
36 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
37 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
38 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
39 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
40 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
42 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
43 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
44 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
45 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
46 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
47 * OF THE POSSIBILITY OF SUCH DAMAGE.
48 * ====================================================================
49 *
50 * This product includes cryptographic software written by Eric Young
51 * (eay@cryptsoft.com). This product includes software written by Tim
52 * Hudson (tjh@cryptsoft.com).
53 *
54 */
55/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
56 * All rights reserved.
57 *
58 * This package is an SSL implementation written
59 * by Eric Young (eay@cryptsoft.com).
60 * The implementation was written so as to conform with Netscapes SSL.
61 *
62 * This library is free for commercial and non-commercial use as long as
63 * the following conditions are aheared to. The following conditions
64 * apply to all code found in this distribution, be it the RC4, RSA,
65 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
66 * included with this distribution is covered by the same copyright terms
67 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
68 *
69 * Copyright remains Eric Young's, and as such any Copyright notices in
70 * the code are not to be removed.
71 * If this package is used in a product, Eric Young should be given attribution
72 * as the author of the parts of the library used.
73 * This can be in the form of a textual message at program startup or
74 * in documentation (online or textual) provided with the package.
75 *
76 * Redistribution and use in source and binary forms, with or without
77 * modification, are permitted provided that the following conditions
78 * are met:
79 * 1. Redistributions of source code must retain the copyright
80 * notice, this list of conditions and the following disclaimer.
81 * 2. Redistributions in binary form must reproduce the above copyright
82 * notice, this list of conditions and the following disclaimer in the
83 * documentation and/or other materials provided with the distribution.
84 * 3. All advertising materials mentioning features or use of this software
85 * must display the following acknowledgement:
86 * "This product includes cryptographic software written by
87 * Eric Young (eay@cryptsoft.com)"
88 * The word 'cryptographic' can be left out if the rouines from the library
89 * being used are not cryptographic related :-).
90 * 4. If you include any Windows specific code (or a derivative thereof) from
91 * the apps directory (application code) you must include an acknowledgement:
92 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
93 *
94 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
95 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
96 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
97 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
98 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
99 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
100 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
101 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
102 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
103 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
104 * SUCH DAMAGE.
105 *
106 * The licence and distribution terms for any publically available version or
107 * derivative of this code cannot be changed. i.e. this code cannot simply be
108 * copied and put under another distribution licence
109 * [including the GNU Public Licence.]
110 */
111
112#include <stdio.h>
113
114#include <openssl/opensslconf.h>
115
116#include <openssl/err.h>
117
118#include "bn_local.h"
119
120#define BN_BLINDING_COUNTER 32
121
122struct bn_blinding_st {
123 BIGNUM *A;
124 BIGNUM *Ai;
125 BIGNUM *e;
126 BIGNUM *mod;
127 CRYPTO_THREADID tid;
128 int counter;
129 BN_MONT_CTX *m_ctx;
130 int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
131 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
132};
133
134BN_BLINDING *
135BN_BLINDING_new(const BIGNUM *e, const BIGNUM *mod, BN_CTX *ctx,
136 int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
137 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx), BN_MONT_CTX *m_ctx)
138{
139 BN_BLINDING *ret = NULL;
140
141 if ((ret = calloc(1, sizeof(BN_BLINDING))) == NULL) {
142 BNerror(ERR_R_MALLOC_FAILURE);
143 goto err;
144 }
145 if ((ret->A = BN_new()) == NULL)
146 goto err;
147 if ((ret->Ai = BN_new()) == NULL)
148 goto err;
149 if ((ret->e = BN_dup(e)) == NULL)
150 goto err;
151 if ((ret->mod = BN_dup(mod)) == NULL)
152 goto err;
153 if (BN_get_flags(mod, BN_FLG_CONSTTIME) != 0)
154 BN_set_flags(ret->mod, BN_FLG_CONSTTIME);
155
156 /* Update on first use. */
157 ret->counter = BN_BLINDING_COUNTER - 1;
158 CRYPTO_THREADID_current(&ret->tid);
159
160 if (bn_mod_exp != NULL)
161 ret->bn_mod_exp = bn_mod_exp;
162 if (m_ctx != NULL)
163 ret->m_ctx = m_ctx;
164
165 return ret;
166
167 err:
168 BN_BLINDING_free(ret);
169
170 return NULL;
171}
172
173void
174BN_BLINDING_free(BN_BLINDING *r)
175{
176 if (r == NULL)
177 return;
178
179 BN_free(r->A);
180 BN_free(r->Ai);
181 BN_free(r->e);
182 BN_free(r->mod);
183 free(r);
184}
185
186static int
187BN_BLINDING_setup(BN_BLINDING *b, BN_CTX *ctx)
188{
189 if (!bn_rand_interval(b->A, 1, b->mod))
190 return 0;
191 if (BN_mod_inverse_ct(b->Ai, b->A, b->mod, ctx) == NULL)
192 return 0;
193
194 if (b->bn_mod_exp != NULL && b->m_ctx != NULL) {
195 if (!b->bn_mod_exp(b->A, b->A, b->e, b->mod, ctx, b->m_ctx))
196 return 0;
197 } else {
198 if (!BN_mod_exp_ct(b->A, b->A, b->e, b->mod, ctx))
199 return 0;
200 }
201
202 return 1;
203}
204
205static int
206BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx)
207{
208 int ret = 0;
209
210 if (++b->counter >= BN_BLINDING_COUNTER) {
211 if (!BN_BLINDING_setup(b, ctx))
212 goto err;
213 b->counter = 0;
214 } else {
215 if (!BN_mod_sqr(b->A, b->A, b->mod, ctx))
216 goto err;
217 if (!BN_mod_sqr(b->Ai, b->Ai, b->mod, ctx))
218 goto err;
219 }
220
221 ret = 1;
222
223 err:
224 return ret;
225}
226
227int
228BN_BLINDING_convert(BIGNUM *n, BIGNUM *inv, BN_BLINDING *b, BN_CTX *ctx)
229{
230 int ret = 0;
231
232 if (!BN_BLINDING_update(b, ctx))
233 goto err;
234
235 if (inv != NULL) {
236 if (!bn_copy(inv, b->Ai))
237 goto err;
238 }
239
240 ret = BN_mod_mul(n, n, b->A, b->mod, ctx);
241
242 err:
243 return ret;
244}
245
246int
247BN_BLINDING_invert(BIGNUM *n, const BIGNUM *inv, BN_BLINDING *b, BN_CTX *ctx)
248{
249 if (inv == NULL)
250 inv = b->Ai;
251
252 return BN_mod_mul(n, n, inv, b->mod, ctx);
253}
254
255CRYPTO_THREADID *
256BN_BLINDING_thread_id(BN_BLINDING *b)
257{
258 return &b->tid;
259}
diff --git a/src/lib/libcrypto/bn/bn_local.h b/src/lib/libcrypto/bn/bn_local.h
index 4269f80156..a9ce466db3 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.37 2023/08/09 09:20:00 tb Exp $ */ 1/* $OpenBSD: bn_local.h,v 1.38 2023/08/09 09:23:03 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,14 +292,6 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
292int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, 292int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
293 BN_RECP_CTX *recp, BN_CTX *ctx); 293 BN_RECP_CTX *recp, BN_CTX *ctx);
294 294
295BN_BLINDING *BN_BLINDING_new(const BIGNUM *e, const BIGNUM *mod, BN_CTX *ctx,
296 int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
297 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx), BN_MONT_CTX *m_ctx);
298void BN_BLINDING_free(BN_BLINDING *b);
299int BN_BLINDING_convert(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
300int BN_BLINDING_invert(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b, BN_CTX *);
301CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
302
303/* Explicitly const time / non-const time versions for internal use */ 295/* Explicitly const time / non-const time versions for internal use */
304int BN_mod_exp_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 296int BN_mod_exp_ct(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
305 const BIGNUM *m, BN_CTX *ctx); 297 const BIGNUM *m, BN_CTX *ctx);