Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c4b2390 authored by Salvatore Benedetto's avatar Salvatore Benedetto Committed by Herbert Xu
Browse files

crypto: ecdh - Add ECDH software support 



* Implement ECDH under kpp API
 * Provide ECC software support for curve P-192 and
   P-256.
 * Add kpp test for ECDH with data generated by OpenSSL

Signed-off-by: default avatarSalvatore Benedetto <salvatore.benedetto@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 802c7f1c

crypto/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -118,6 +118,11 @@ config CRYPTO_DH 
	help

	  Generic implementation of the Diffie-Hellman algorithm.



config CRYPTO_ECDH

	tristate "ECDH algorithm"

	select CRYTPO_KPP

	help

	  Generic implementation of the ECDH algorithm



config CRYPTO_MANAGER

	tristate "Cryptographic algorithm manager"

crypto/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ obj-$(CONFIG_CRYPTO_KPP2) += kpp.o 
dh_generic-y := dh.o

dh_generic-y += dh_helper.o

obj-$(CONFIG_CRYPTO_DH) += dh_generic.o

ecdh_generic-y := ecc.o

ecdh_generic-y += ecdh.o

ecdh_generic-y += ecdh_helper.o

obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o



$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h

$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h

crypto/ecc.c

0 → 100644
+1018 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/ecc.h

0 → 100644
+83 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, Kenneth MacKay

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are

 * met:

 *  * Redistributions of source code must retain the above copyright

 *   notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

#ifndef _CRYPTO_ECC_H

#define _CRYPTO_ECC_H



#define ECC_MAX_DIGITS	4 /* 256 */



#define ECC_DIGITS_TO_BYTES_SHIFT 3



/**

 * ecc_is_key_valid() - Validate a given ECDH private key

 *

 * @curve_id:		id representing the curve to use

 * @ndigits:		curve number of digits

 * @private_key:	private key to be used for the given curve

 * @private_key_len:	private key len

 *

 * Returns 0 if the key is acceptable, a negative value otherwise

 */

int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,

		     const u8 *private_key, unsigned int private_key_len);



/**

 * ecdh_make_pub_key() - Compute an ECC public key

 *

 * @curve_id:		id representing the curve to use

 * @private_key:	pregenerated private key for the given curve

 * @private_key_len:	length of private_key

 * @public_key:		buffer for storing the public key generated

 * @public_key_len:	length of the public_key buffer

 *

 * Returns 0 if the public key was generated successfully, a negative value

 * if an error occurred.

 */

int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits,

		      const u8 *private_key, unsigned int private_key_len,

		      u8 *public_key, unsigned int public_key_len);



/**

 * ecdh_shared_secret() - Compute a shared secret

 *

 * @curve_id:		id representing the curve to use

 * @private_key:	private key of part A

 * @private_key_len:	length of private_key

 * @public_key:		public key of counterpart B

 * @public_key_len:	length of public_key

 * @secret:		buffer for storing the calculated shared secret

 * @secret_len:		length of the secret buffer

 *

 * Note: It is recommended that you hash the result of ecdh_shared_secret

 * before using it for symmetric encryption or HMAC.

 *

 * Returns 0 if the shared secret was generated successfully, a negative value

 * if an error occurred.

 */

int ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,

		       const u8 *private_key, unsigned int private_key_len,

		       const u8 *public_key, unsigned int public_key_len,

		       u8 *secret, unsigned int secret_len);

#endif

crypto/ecc_curve_defs.h

0 → 100644
+57 −0
Original line number Diff line number Diff line 
#ifndef _CRYTO_ECC_CURVE_DEFS_H

#define _CRYTO_ECC_CURVE_DEFS_H



struct ecc_point {

	u64 *x;

	u64 *y;

	u8 ndigits;

};



struct ecc_curve {

	char *name;

	struct ecc_point g;

	u64 *p;

	u64 *n;

};



/* NIST P-192 */

static u64 nist_p192_g_x[] = { 0xF4FF0AFD82FF1012ull, 0x7CBF20EB43A18800ull,

				0x188DA80EB03090F6ull };

static u64 nist_p192_g_y[] = { 0x73F977A11E794811ull, 0x631011ED6B24CDD5ull,

				0x07192B95FFC8DA78ull };

static u64 nist_p192_p[] = { 0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFFFFFFFFFEull,

				0xFFFFFFFFFFFFFFFFull };

static u64 nist_p192_n[] = { 0x146BC9B1B4D22831ull, 0xFFFFFFFF99DEF836ull,

				0xFFFFFFFFFFFFFFFFull };

static struct ecc_curve nist_p192 = {

	.name = "nist_192",

	.g = {

		.x = nist_p192_g_x,

		.y = nist_p192_g_y,

		.ndigits = 3,

	},

	.p = nist_p192_p,

	.n = nist_p192_n

};



/* NIST P-256 */

static u64 nist_p256_g_x[] = { 0xF4A13945D898C296ull, 0x77037D812DEB33A0ull,

				0xF8BCE6E563A440F2ull, 0x6B17D1F2E12C4247ull };

static u64 nist_p256_g_y[] = { 0xCBB6406837BF51F5ull, 0x2BCE33576B315ECEull,

				0x8EE7EB4A7C0F9E16ull, 0x4FE342E2FE1A7F9Bull };

static u64 nist_p256_p[] = { 0xFFFFFFFFFFFFFFFFull, 0x00000000FFFFFFFFull,

				0x0000000000000000ull, 0xFFFFFFFF00000001ull };

static u64 nist_p256_n[] = { 0xF3B9CAC2FC632551ull, 0xBCE6FAADA7179E84ull,

				0xFFFFFFFFFFFFFFFFull, 0xFFFFFFFF00000000ull };

static struct ecc_curve nist_p256 = {

	.name = "nist_256",

	.g = {

		.x = nist_p256_g_x,

		.y = nist_p256_g_y,

		.ndigits = 4,

	},

	.p = nist_p256_p,

	.n = nist_p256_n

};



#endif