Commit c0d6bd1f authored by Stefan Berger's avatar Stefan Berger Committed by Herbert Xu

crypto: ecc - Add nbits field to ecc_curve structure

Add the number of bits a curve has to the ecc_curve definition to be able
to derive the number of bytes a curve requires for its coordinates from it.
It also allows one to identify a curve by its particular size. Set the
number of bits on all curve definitions.
Tested-by: default avatarLukas Wunner <lukas@wunner.de>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarStefan Berger <stefanb@linux.ibm.com>
Reviewed-by: default avatarVitaly Chikunov <vt@altlinux.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 48e8d3a5
...@@ -17,6 +17,7 @@ static u64 nist_p192_b[] = { 0xFEB8DEECC146B9B1ull, 0x0FA7E9AB72243049ull, ...@@ -17,6 +17,7 @@ static u64 nist_p192_b[] = { 0xFEB8DEECC146B9B1ull, 0x0FA7E9AB72243049ull,
0x64210519E59C80E7ull }; 0x64210519E59C80E7ull };
static struct ecc_curve nist_p192 = { static struct ecc_curve nist_p192 = {
.name = "nist_192", .name = "nist_192",
.nbits = 192,
.g = { .g = {
.x = nist_p192_g_x, .x = nist_p192_g_x,
.y = nist_p192_g_y, .y = nist_p192_g_y,
...@@ -43,6 +44,7 @@ static u64 nist_p256_b[] = { 0x3BCE3C3E27D2604Bull, 0x651D06B0CC53B0F6ull, ...@@ -43,6 +44,7 @@ static u64 nist_p256_b[] = { 0x3BCE3C3E27D2604Bull, 0x651D06B0CC53B0F6ull,
0xB3EBBD55769886BCull, 0x5AC635D8AA3A93E7ull }; 0xB3EBBD55769886BCull, 0x5AC635D8AA3A93E7ull };
static struct ecc_curve nist_p256 = { static struct ecc_curve nist_p256 = {
.name = "nist_256", .name = "nist_256",
.nbits = 256,
.g = { .g = {
.x = nist_p256_g_x, .x = nist_p256_g_x,
.y = nist_p256_g_y, .y = nist_p256_g_y,
...@@ -75,6 +77,7 @@ static u64 nist_p384_b[] = { 0x2a85c8edd3ec2aefull, 0xc656398d8a2ed19dull, ...@@ -75,6 +77,7 @@ static u64 nist_p384_b[] = { 0x2a85c8edd3ec2aefull, 0xc656398d8a2ed19dull,
0x988e056be3f82d19ull, 0xb3312fa7e23ee7e4ull }; 0x988e056be3f82d19ull, 0xb3312fa7e23ee7e4ull };
static struct ecc_curve nist_p384 = { static struct ecc_curve nist_p384 = {
.name = "nist_384", .name = "nist_384",
.nbits = 384,
.g = { .g = {
.x = nist_p384_g_x, .x = nist_p384_g_x,
.y = nist_p384_g_y, .y = nist_p384_g_y,
...@@ -95,6 +98,7 @@ static u64 curve25519_a[] = { 0x000000000001DB41, 0x0000000000000000, ...@@ -95,6 +98,7 @@ static u64 curve25519_a[] = { 0x000000000001DB41, 0x0000000000000000,
0x0000000000000000, 0x0000000000000000 }; 0x0000000000000000, 0x0000000000000000 };
static const struct ecc_curve ecc_25519 = { static const struct ecc_curve ecc_25519 = {
.name = "curve25519", .name = "curve25519",
.nbits = 255,
.g = { .g = {
.x = curve25519_g_x, .x = curve25519_g_x,
.ndigits = 4, .ndigits = 4,
......
...@@ -47,6 +47,7 @@ static u64 cp256a_b[] = { ...@@ -47,6 +47,7 @@ static u64 cp256a_b[] = {
static struct ecc_curve gost_cp256a = { static struct ecc_curve gost_cp256a = {
.name = "cp256a", .name = "cp256a",
.nbits = 256,
.g = { .g = {
.x = cp256a_g_x, .x = cp256a_g_x,
.y = cp256a_g_y, .y = cp256a_g_y,
...@@ -80,6 +81,7 @@ static u64 cp256b_b[] = { ...@@ -80,6 +81,7 @@ static u64 cp256b_b[] = {
static struct ecc_curve gost_cp256b = { static struct ecc_curve gost_cp256b = {
.name = "cp256b", .name = "cp256b",
.nbits = 256,
.g = { .g = {
.x = cp256b_g_x, .x = cp256b_g_x,
.y = cp256b_g_y, .y = cp256b_g_y,
...@@ -117,6 +119,7 @@ static u64 cp256c_b[] = { ...@@ -117,6 +119,7 @@ static u64 cp256c_b[] = {
static struct ecc_curve gost_cp256c = { static struct ecc_curve gost_cp256c = {
.name = "cp256c", .name = "cp256c",
.nbits = 256,
.g = { .g = {
.x = cp256c_g_x, .x = cp256c_g_x,
.y = cp256c_g_y, .y = cp256c_g_y,
...@@ -166,6 +169,7 @@ static u64 tc512a_b[] = { ...@@ -166,6 +169,7 @@ static u64 tc512a_b[] = {
static struct ecc_curve gost_tc512a = { static struct ecc_curve gost_tc512a = {
.name = "tc512a", .name = "tc512a",
.nbits = 512,
.g = { .g = {
.x = tc512a_g_x, .x = tc512a_g_x,
.y = tc512a_g_y, .y = tc512a_g_y,
...@@ -211,6 +215,7 @@ static u64 tc512b_b[] = { ...@@ -211,6 +215,7 @@ static u64 tc512b_b[] = {
static struct ecc_curve gost_tc512b = { static struct ecc_curve gost_tc512b = {
.name = "tc512b", .name = "tc512b",
.nbits = 512,
.g = { .g = {
.x = tc512b_g_x, .x = tc512b_g_x,
.y = tc512b_g_y, .y = tc512b_g_y,
......
...@@ -23,6 +23,7 @@ struct ecc_point { ...@@ -23,6 +23,7 @@ struct ecc_point {
* struct ecc_curve - definition of elliptic curve * struct ecc_curve - definition of elliptic curve
* *
* @name: Short name of the curve. * @name: Short name of the curve.
* @nbits: The number of bits of a curve.
* @g: Generator point of the curve. * @g: Generator point of the curve.
* @p: Prime number, if Barrett's reduction is used for this curve * @p: Prime number, if Barrett's reduction is used for this curve
* pre-calculated value 'mu' is appended to the @p after ndigits. * pre-calculated value 'mu' is appended to the @p after ndigits.
...@@ -34,6 +35,7 @@ struct ecc_point { ...@@ -34,6 +35,7 @@ struct ecc_point {
*/ */
struct ecc_curve { struct ecc_curve {
char *name; char *name;
u32 nbits;
struct ecc_point g; struct ecc_point g;
u64 *p; u64 *p;
u64 *n; u64 *n;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment