History

crypto: ecc - make ecc into separate module

ecc.c have algorithms that could be used togeter by ecdh and ecrdsa. Make it separate module. Add CRYPTO_ECC into Kconfig. EXPORT_SYMBOL and document to what seems appropriate. Move structs ecc_point and ecc_curve from ecc_curve_defs.h into ecc.h. No code changes.

Vitaly Chikunov committed 7 years ago

Commit 4a2289d1 parent 3d6228a5 files · +122 −23Browse files

Unified · Split

5 files
  1. crypto/Kconfig +4 −0
  2. crypto/Makefile +1 −1
  3. crypto/ecc.c +18 −7
  4. crypto/ecc.h +99 −0
  5. crypto/ecc_curve_defs.h +0 −15
crypto/Kconfig+4−0
@@ -248,8 +248,12 @@ config CRYPTO_DH · 247 unmodified lines
248 help248 help
249 Generic implementation of the Diffie-Hellman algorithm.249 Generic implementation of the Diffie-Hellman algorithm.
250 250
251config CRYPTO_ECC
252 tristate
253
251config CRYPTO_ECDH254config CRYPTO_ECDH
252 tristate "ECDH algorithm"255 tristate "ECDH algorithm"
256 select CRYPTO_ECC
253 select CRYPTO_KPP257 select CRYPTO_KPP
254 select CRYPTO_RNG_DEFAULT258 select CRYPTO_RNG_DEFAULT
255 help259 help
crypto/Makefile+1−1
@@ -147,8 +147,8 @@ obj-$(CONFIG_CRYPTO_USER_API_RNG) += algif_rng.o · 146 unmodified lines
147obj-$(CONFIG_CRYPTO_USER_API_AEAD) += algif_aead.o147obj-$(CONFIG_CRYPTO_USER_API_AEAD) += algif_aead.o
148obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o148obj-$(CONFIG_CRYPTO_ZSTD) += zstd.o
149obj-$(CONFIG_CRYPTO_OFB) += ofb.o149obj-$(CONFIG_CRYPTO_OFB) += ofb.o
150obj-$(CONFIG_CRYPTO_ECC) += ecc.o
150 151
151ecdh_generic-y := ecc.o
152ecdh_generic-y += ecdh.o152ecdh_generic-y += ecdh.o
153ecdh_generic-y += ecdh_helper.o153ecdh_generic-y += ecdh_helper.o
154obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o154obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
crypto/ecc.c+18−7
@@ -24,6 +24,7 @@ · 23 unmodified lines
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */25 */
26 26
27#include <linux/module.h>
27#include <linux/random.h>28#include <linux/random.h>
28#include <linux/slab.h>29#include <linux/slab.h>
29#include <linux/swab.h>30#include <linux/swab.h>
@@ -112,7 +113,7 @@ static void vli_clear(u64 *vli, unsigned int ndigits) · 82 unmodified lines
112}113}
113 114
114/* Returns true if vli == 0, false otherwise. */115/* Returns true if vli == 0, false otherwise. */
115static bool vli_is_zero(const u64 *vli, unsigned int ndigits)116bool vli_is_zero(const u64 *vli, unsigned int ndigits)
116{117{
117 int i;118 int i;
118 119
@@ -123,6 +124,7 @@ static bool vli_is_zero(const u64 *vli, unsigned int ndigits) · 4 unmodified lines
123 124
124 return true;125 return true;
125}126}
127EXPORT_SYMBOL(vli_is_zero);
126 128
127/* Returns nonzero if bit bit of vli is set. */129/* Returns nonzero if bit bit of vli is set. */
128static u64 vli_test_bit(const u64 *vli, unsigned int bit)130static u64 vli_test_bit(const u64 *vli, unsigned int bit)
@@ -171,7 +173,7 @@ static void vli_set(u64 *dest, const u64 *src, unsigned int ndigits) · 42 unmodified lines
171}173}
172 174
173/* Returns sign of left - right. */175/* Returns sign of left - right. */
174static int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits)176int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits)
175{177{
176 int i;178 int i;
177 179
@@ -184,6 +186,7 @@ static int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits) · 6 unmodified lines
184 186
185 return 0;187 return 0;
186}188}
189EXPORT_SYMBOL(vli_cmp);
187 190
188/* Computes result = in << c, returning carry. Can modify in place191/* Computes result = in << c, returning carry. Can modify in place
189 * (if result == in). 0 < shift < 64.192 * (if result == in). 0 < shift < 64.
@@ -240,7 +243,7 @@ static u64 vli_add(u64 *result, const u64 *left, const u64 *right, · 50 unmodified lines
240}243}
241 244
242/* Computes result = left - right, returning borrow. Can modify in place. */245/* Computes result = left - right, returning borrow. Can modify in place. */
243static u64 vli_sub(u64 *result, const u64 *left, const u64 *right,246u64 vli_sub(u64 *result, const u64 *left, const u64 *right,
244 unsigned int ndigits)247 unsigned int ndigits)
245{248{
246 u64 borrow = 0;249 u64 borrow = 0;
@@ -258,6 +261,7 @@ static u64 vli_sub(u64 *result, const u64 *left, const u64 *right, · 11 unmodified lines
258 261
259 return borrow;262 return borrow;
260}263}
264EXPORT_SYMBOL(vli_sub);
261 265
262static uint128_t mul_64_64(u64 left, u64 right)266static uint128_t mul_64_64(u64 left, u64 right)
263{267{
@@ -557,7 +561,7 @@ static void vli_mod_square_fast(u64 *result, const u64 *left, · 293 unmodified lines
557 * See "From Euclid's GCD to Montgomery Multiplication to the Great Divide"561 * See "From Euclid's GCD to Montgomery Multiplication to the Great Divide"
558 * https://labs.oracle.com/techrep/2001/smli_tr-2001-95.pdf562 * https://labs.oracle.com/techrep/2001/smli_tr-2001-95.pdf
559 */563 */
560static void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,564void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,
561 unsigned int ndigits)565 unsigned int ndigits)
562{566{
563 u64 a[ECC_MAX_DIGITS], b[ECC_MAX_DIGITS];567 u64 a[ECC_MAX_DIGITS], b[ECC_MAX_DIGITS];
@@ -630,6 +634,7 @@ static void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod, · 66 unmodified lines
630 634
631 vli_set(result, u, ndigits);635 vli_set(result, u, ndigits);
632}636}
637EXPORT_SYMBOL(vli_mod_inv);
633 638
634/* ------ Point operations ------ */639/* ------ Point operations ------ */
635 640
@@ -948,6 +953,7 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits, · 312 unmodified lines
948 953
949 return __ecc_is_key_valid(curve, private_key, ndigits);954 return __ecc_is_key_valid(curve, private_key, ndigits);
950}955}
956EXPORT_SYMBOL(ecc_is_key_valid);
951 957
952/*958/*
953 * ECC private keys are generated using the method of extra random bits,959 * ECC private keys are generated using the method of extra random bits,
@@ -1000,6 +1006,7 @@ int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey) · 46 unmodified lines
1000 1006
1001 return 0;1007 return 0;
1002}1008}
1009EXPORT_SYMBOL(ecc_gen_privkey);
1003 1010
1004int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits,1011int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits,
1005 const u64 *private_key, u64 *public_key)1012 const u64 *private_key, u64 *public_key)
@@ -1036,10 +1043,11 @@ err_free_point: · 30 unmodified lines
1036out:1043out:
1037 return ret;1044 return ret;
1038}1045}
1046EXPORT_SYMBOL(ecc_make_pub_key);
1039 1047
1040/* SP800-56A section 5.6.2.3.4 partial verification: ephemeral keys only */1048/* SP800-56A section 5.6.2.3.4 partial verification: ephemeral keys only */
1041static int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,1049int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,
1042 struct ecc_point *pk)1050 struct ecc_point *pk)
1043{1051{
1044 u64 yy[ECC_MAX_DIGITS], xxx[ECC_MAX_DIGITS], w[ECC_MAX_DIGITS];1052 u64 yy[ECC_MAX_DIGITS], xxx[ECC_MAX_DIGITS], w[ECC_MAX_DIGITS];
1045 1053
@@ -1064,8 +1072,8 @@ static int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve, · 18 unmodified lines
1064 return -EINVAL;1072 return -EINVAL;
1065 1073
1066 return 0;1074 return 0;
1067
1068}1075}
1076EXPORT_SYMBOL(ecc_is_pubkey_valid_partial);
1069 1077
1070int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,1078int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
1071 const u64 *private_key, const u64 *public_key,1079 const u64 *private_key, const u64 *public_key,
@@ -1121,3 +1129,6 @@ err_alloc_product: · 49 unmodified lines
1121out:1129out:
1122 return ret;1130 return ret;
1123}1131}
1132EXPORT_SYMBOL(crypto_ecdh_shared_secret);
1133
1134MODULE_LICENSE("Dual BSD/GPL");
crypto/ecc.h+99−0
@@ -32,6 +32,41 @@ · 31 unmodified lines
32 32
33#define ECC_DIGITS_TO_BYTES_SHIFT 333#define ECC_DIGITS_TO_BYTES_SHIFT 3
34 34
35/**
36 * struct ecc_point - elliptic curve point in affine coordinates
37 *
38 * @x: X coordinate in vli form.
39 * @y: Y coordinate in vli form.
40 * @ndigits: Length of vlis in u64 qwords.
41 */
42struct ecc_point {
43 u64 *x;
44 u64 *y;
45 u8 ndigits;
46};
47
48/**
49 * struct ecc_curve - definition of elliptic curve
50 *
51 * @name: Short name of the curve.
52 * @g: Generator point of the curve.
53 * @p: Prime number, if Barrett's reduction is used for this curve
54 * pre-calculated value 'mu' is appended to the @p after ndigits.
55 * Use of Barrett's reduction is heuristically determined in
56 * vli_mmod_fast().
57 * @n: Order of the curve group.
58 * @a: Curve parameter a.
59 * @b: Curve parameter b.
60 */
61struct ecc_curve {
62 char *name;
63 struct ecc_point g;
64 u64 *p;
65 u64 *n;
66 u64 *a;
67 u64 *b;
68};
69
35/**70/**
36 * ecc_is_key_valid() - Validate a given ECDH private key71 * ecc_is_key_valid() - Validate a given ECDH private key
37 *72 *
@@ -91,4 +126,68 @@ int ecc_make_pub_key(const unsigned int curve_id, unsigned int ndigits, · 53 unmodified lines
91int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,126int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
92 const u64 *private_key, const u64 *public_key,127 const u64 *private_key, const u64 *public_key,
93 u64 *secret);128 u64 *secret);
129
130/**
131 * ecc_is_pubkey_valid_partial() - Partial public key validation
132 *
133 * @curve: elliptic curve domain parameters
134 * @pk: public key as a point
135 *
136 * Valdiate public key according to SP800-56A section 5.6.2.3.4 ECC Partial
137 * Public-Key Validation Routine.
138 *
139 * Note: There is no check that the public key is in the correct elliptic curve
140 * subgroup.
141 *
142 * Return: 0 if validation is successful, -EINVAL if validation is failed.
143 */
144int ecc_is_pubkey_valid_partial(const struct ecc_curve *curve,
145 struct ecc_point *pk);
146
147/**
148 * vli_is_zero() - Determine is vli is zero
149 *
150 * @vli: vli to check.
151 * @ndigits: length of the @vli
152 */
153bool vli_is_zero(const u64 *vli, unsigned int ndigits);
154
155/**
156 * vli_cmp() - compare left and right vlis
157 *
158 * @left: vli
159 * @right: vli
160 * @ndigits: length of both vlis
161 *
162 * Returns sign of @left - @right, i.e. -1 if @left < @right,
163 * 0 if @left == @right, 1 if @left > @right.
164 */
165int vli_cmp(const u64 *left, const u64 *right, unsigned int ndigits);
166
167/**
168 * vli_sub() - Subtracts right from left
169 *
170 * @result: where to write result
171 * @left: vli
172 * @right vli
173 * @ndigits: length of all vlis
174 *
175 * Note: can modify in-place.
176 *
177 * Return: carry bit.
178 */
179u64 vli_sub(u64 *result, const u64 *left, const u64 *right,
180 unsigned int ndigits);
181
182/**
183 * vli_mod_inv() - Modular inversion
184 *
185 * @result: where to write vli number
186 * @input: vli value to operate on
187 * @mod: modulus
188 * @ndigits: length of all vlis
189 */
190void vli_mod_inv(u64 *result, const u64 *input, const u64 *mod,
191 unsigned int ndigits);
192
94#endif193#endif
crypto/ecc_curve_defs.h+0−15
@@ -2,21 +2,6 @@ · 1 unmodified line
2#ifndef _CRYTO_ECC_CURVE_DEFS_H2#ifndef _CRYTO_ECC_CURVE_DEFS_H
3#define _CRYTO_ECC_CURVE_DEFS_H3#define _CRYTO_ECC_CURVE_DEFS_H
4 4
5struct ecc_point {
6 u64 *x;
7 u64 *y;
8 u8 ndigits;
9};
10
11struct ecc_curve {
12 char *name;
13 struct ecc_point g;
14 u64 *p;
15 u64 *n;
16 u64 *a;
17 u64 *b;
18};
19
20/* NIST P-192: a = p - 3 */5/* NIST P-192: a = p - 3 */
21static u64 nist_p192_g_x[] = { 0xF4FF0AFD82FF1012ull, 0x7CBF20EB43A18800ull,6static u64 nist_p192_g_x[] = { 0xF4FF0AFD82FF1012ull, 0x7CBF20EB43A18800ull,
22 0x188DA80EB03090F6ull };7 0x188DA80EB03090F6ull };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t