wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

ed25519: fixed initial data to auto values for embedded compilers

Browse Source
This commit is contained in:
Takashi Kojo
2015-08-29 12:08:52 +09:00
parent 1ba1acb8f7
commit 2a141f6a82
3 changed files with 539 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wolfcrypt/src/ge_low_mem.c
View File

@@ -217,33 +217,35 @@ void sc_muladd(byte* out, const byte* a, const byte* b, const byte* c)
* t is x*y. * t is x*y.
*/ */
const ge_p3 ed25519_base = { const ge_p3 ed25519_base = {
.X = { {
0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9, 0x1a, 0xd5, 0x25, 0x8f, 0x60, 0x2d, 0x56, 0xc9,
0xb2, 0xa7, 0x25, 0x95, 0x60, 0xc7, 0x2c, 0x69, 0xb2, 0xa7, 0x25, 0x95, 0x60, 0xc7, 0x2c, 0x69,
0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0, 0x5c, 0xdc, 0xd6, 0xfd, 0x31, 0xe2, 0xa4, 0xc0,
0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21 0xfe, 0x53, 0x6e, 0xcd, 0xd3, 0x36, 0x69, 0x21
}, },
.Y = { {
0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x58, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66
}, },
.T = { {1, 0}
{
0xa3, 0xdd, 0xb7, 0xa5, 0xb3, 0x8a, 0xde, 0x6d, 0xa3, 0xdd, 0xb7, 0xa5, 0xb3, 0x8a, 0xde, 0x6d,
0xf5, 0x52, 0x51, 0x77, 0x80, 0x9f, 0xf0, 0x20, 0xf5, 0x52, 0x51, 0x77, 0x80, 0x9f, 0xf0, 0x20,
0x7d, 0xe3, 0xab, 0x64, 0x8e, 0x4e, 0xea, 0x66, 0x7d, 0xe3, 0xab, 0x64, 0x8e, 0x4e, 0xea, 0x66,
0x65, 0x76, 0x8b, 0xd7, 0x0f, 0x5f, 0x87, 0x67 0x65, 0x76, 0x8b, 0xd7, 0x0f, 0x5f, 0x87, 0x67
}, },
.Z = {1, 0}
}; };
const ge_p3 ed25519_neutral = { const ge_p3 ed25519_neutral = {
.X = {0}, {0},
.Y = {1, 0}, {1, 0},
.T = {0}, {1, 0}
.Z = {1, 0} {0},
}; };

3
wolfcrypt/src/ge_operations.c
View File

@@ -32,6 +32,7 @@
#ifdef HAVE_ED25519 #ifdef HAVE_ED25519
#include <wolfssl/wolfcrypt/ge_operations.h> #include <wolfssl/wolfcrypt/ge_operations.h>
#include <wolfssl/wolfcrypt/ed25519.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#ifdef NO_INLINE #ifdef NO_INLINE
#include <wolfssl/wolfcrypt/misc.h> #include <wolfssl/wolfcrypt/misc.h>
@@ -690,7 +691,7 @@ int ge_compress_key(byte* out, const byte* xIn, const byte* yIn, word32 keySz)
{ {
fe x,y,z; fe x,y,z;
ge_p3 g; ge_p3 g;
byte bArray[keySz]; byte bArray[ED25519_KEY_SIZE];
word32 i; word32 i;
fe_0(x); fe_0(x);

58
wolfcrypt/test/test.c
View File

@@ -5760,21 +5760,21 @@ int ed25519_test(void)
https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02 https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02
*/ */
const byte sKey1[] = { static const byte sKey1[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60, 0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4, 0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19, 0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60 0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60
}; };
const byte sKey2[] = { static const byte sKey2[] = {
0x4c,0xcd,0x08,0x9b,0x28,0xff,0x96,0xda, 0x4c,0xcd,0x08,0x9b,0x28,0xff,0x96,0xda,
0x9d,0xb6,0xc3,0x46,0xec,0x11,0x4e,0x0f, 0x9d,0xb6,0xc3,0x46,0xec,0x11,0x4e,0x0f,
0x5b,0x8a,0x31,0x9f,0x35,0xab,0xa6,0x24, 0x5b,0x8a,0x31,0x9f,0x35,0xab,0xa6,0x24,
0xda,0x8c,0xf6,0xed,0x4f,0xb8,0xa6,0xfb 0xda,0x8c,0xf6,0xed,0x4f,0xb8,0xa6,0xfb
}; };
const byte sKey3[] = { static const byte sKey3[] = {
0xc5,0xaa,0x8d,0xf4,0x3f,0x9f,0x83,0x7b, 0xc5,0xaa,0x8d,0xf4,0x3f,0x9f,0x83,0x7b,
0xed,0xb7,0x44,0x2f,0x31,0xdc,0xb7,0xb1, 0xed,0xb7,0x44,0x2f,0x31,0xdc,0xb7,0xb1,
0x66,0xd3,0x85,0x35,0x07,0x6f,0x09,0x4b, 0x66,0xd3,0x85,0x35,0x07,0x6f,0x09,0x4b,
@@ -5782,7 +5782,7 @@ int ed25519_test(void)
}; };
/* uncompressed test */ /* uncompressed test */
const byte sKey4[] = { static const byte sKey4[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60, 0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4, 0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19, 0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
@@ -5790,37 +5790,37 @@ int ed25519_test(void)
}; };
/* compressed prefix test */ /* compressed prefix test */
const byte sKey5[] = { static const byte sKey5[] = {
0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60, 0x9d,0x61,0xb1,0x9d,0xef,0xfd,0x5a,0x60,
0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4, 0xba,0x84,0x4a,0xf4,0x92,0xec,0x2c,0xc4,
0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19, 0x44,0x49,0xc5,0x69,0x7b,0x32,0x69,0x19,
0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60 0x70,0x3b,0xac,0x03,0x1c,0xae,0x7f,0x60
}; };
const byte sKey6[] = { static const byte sKey6[] = {
0xf5,0xe5,0x76,0x7c,0xf1,0x53,0x31,0x95, 0xf5,0xe5,0x76,0x7c,0xf1,0x53,0x31,0x95,
0x17,0x63,0x0f,0x22,0x68,0x76,0xb8,0x6c, 0x17,0x63,0x0f,0x22,0x68,0x76,0xb8,0x6c,
0x81,0x60,0xcc,0x58,0x3b,0xc0,0x13,0x74, 0x81,0x60,0xcc,0x58,0x3b,0xc0,0x13,0x74,
0x4c,0x6b,0xf2,0x55,0xf5,0xcc,0x0e,0xe5 0x4c,0x6b,0xf2,0x55,0xf5,0xcc,0x0e,0xe5
}; };
const byte* sKeys[] = {sKey1, sKey2, sKey3, sKey4, sKey5, sKey6}; static const byte* sKeys[] = {sKey1, sKey2, sKey3, sKey4, sKey5, sKey6};
const byte pKey1[] = { static const byte pKey1[] = {
0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7, 0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7,
0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a, 0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a,
0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25, 0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25,
0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a 0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a
}; };
const byte pKey2[] = { static const byte pKey2[] = {
0x3d,0x40,0x17,0xc3,0xe8,0x43,0x89,0x5a, 0x3d,0x40,0x17,0xc3,0xe8,0x43,0x89,0x5a,
0x92,0xb7,0x0a,0xa7,0x4d,0x1b,0x7e,0xbc, 0x92,0xb7,0x0a,0xa7,0x4d,0x1b,0x7e,0xbc,
0x9c,0x98,0x2c,0xcf,0x2e,0xc4,0x96,0x8c, 0x9c,0x98,0x2c,0xcf,0x2e,0xc4,0x96,0x8c,
0xc0,0xcd,0x55,0xf1,0x2a,0xf4,0x66,0x0c 0xc0,0xcd,0x55,0xf1,0x2a,0xf4,0x66,0x0c
}; };
const byte pKey3[] = { static const byte pKey3[] = {
0xfc,0x51,0xcd,0x8e,0x62,0x18,0xa1,0xa3, 0xfc,0x51,0xcd,0x8e,0x62,0x18,0xa1,0xa3,
0x8d,0xa4,0x7e,0xd0,0x02,0x30,0xf0,0x58, 0x8d,0xa4,0x7e,0xd0,0x02,0x30,0xf0,0x58,
0x08,0x16,0xed,0x13,0xba,0x33,0x03,0xac, 0x08,0x16,0xed,0x13,0xba,0x33,0x03,0xac,
@@ -5828,7 +5828,7 @@ int ed25519_test(void)
}; };
/* uncompressed test */ /* uncompressed test */
const byte pKey4[] = { static const byte pKey4[] = {
0x04,0x55,0xd0,0xe0,0x9a,0x2b,0x9d,0x34, 0x04,0x55,0xd0,0xe0,0x9a,0x2b,0x9d,0x34,
0x29,0x22,0x97,0xe0,0x8d,0x60,0xd0,0xf6, 0x29,0x22,0x97,0xe0,0x8d,0x60,0xd0,0xf6,
0x20,0xc5,0x13,0xd4,0x72,0x53,0x18,0x7c, 0x20,0xc5,0x13,0xd4,0x72,0x53,0x18,0x7c,
@@ -5841,25 +5841,25 @@ int ed25519_test(void)
}; };
/* compressed prefix */ /* compressed prefix */
const byte pKey5[] = { static const byte pKey5[] = {
0x40,0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7, 0x40,0xd7,0x5a,0x98,0x01,0x82,0xb1,0x0a,0xb7,
0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a, 0xd5,0x4b,0xfe,0xd3,0xc9,0x64,0x07,0x3a,
0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25, 0x0e,0xe1,0x72,0xf3,0xda,0xa6,0x23,0x25,
0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a 0xaf,0x02,0x1a,0x68,0xf7,0x07,0x51,0x1a
}; };
const byte pKey6[] = { static const byte pKey6[] = {
0x27,0x81,0x17,0xfc,0x14,0x4c,0x72,0x34, 0x27,0x81,0x17,0xfc,0x14,0x4c,0x72,0x34,
0x0f,0x67,0xd0,0xf2,0x31,0x6e,0x83,0x86, 0x0f,0x67,0xd0,0xf2,0x31,0x6e,0x83,0x86,
0xce,0xff,0xbf,0x2b,0x24,0x28,0xc9,0xc5, 0xce,0xff,0xbf,0x2b,0x24,0x28,0xc9,0xc5,
0x1f,0xef,0x7c,0x59,0x7f,0x1d,0x42,0x6e 0x1f,0xef,0x7c,0x59,0x7f,0x1d,0x42,0x6e
}; };
const byte* pKeys[] = {pKey1, pKey2, pKey3, pKey4, pKey5, pKey6}; static const byte* pKeys[] = {pKey1, pKey2, pKey3, pKey4, pKey5, pKey6};
const byte pKeySz[] = {sizeof(pKey1), sizeof(pKey2), sizeof(pKey3), static const byte pKeySz[] = {sizeof(pKey1), sizeof(pKey2), sizeof(pKey3),
sizeof(pKey4), sizeof(pKey5), sizeof(pKey6)}; sizeof(pKey4), sizeof(pKey5), sizeof(pKey6)};
const byte sig1[] = { static const byte sig1[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72, 0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a, 0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74, 0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
@@ -5870,7 +5870,7 @@ int ed25519_test(void)
0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b 0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b
}; };
const byte sig2[] = { static const byte sig2[] = {
0x92,0xa0,0x09,0xa9,0xf0,0xd4,0xca,0xb8, 0x92,0xa0,0x09,0xa9,0xf0,0xd4,0xca,0xb8,
0x72,0x0e,0x82,0x0b,0x5f,0x64,0x25,0x40, 0x72,0x0e,0x82,0x0b,0x5f,0x64,0x25,0x40,
0xa2,0xb2,0x7b,0x54,0x16,0x50,0x3f,0x8f, 0xa2,0xb2,0x7b,0x54,0x16,0x50,0x3f,0x8f,
@@ -5881,7 +5881,7 @@ int ed25519_test(void)
0xb0,0x0d,0x29,0x16,0x12,0xbb,0x0c,0x00 0xb0,0x0d,0x29,0x16,0x12,0xbb,0x0c,0x00
}; };
const byte sig3[] = { static const byte sig3[] = {
0x62,0x91,0xd6,0x57,0xde,0xec,0x24,0x02, 0x62,0x91,0xd6,0x57,0xde,0xec,0x24,0x02,
0x48,0x27,0xe6,0x9c,0x3a,0xbe,0x01,0xa3, 0x48,0x27,0xe6,0x9c,0x3a,0xbe,0x01,0xa3,
0x0c,0xe5,0x48,0xa2,0x84,0x74,0x3a,0x44, 0x0c,0xe5,0x48,0xa2,0x84,0x74,0x3a,0x44,
@@ -5893,7 +5893,7 @@ int ed25519_test(void)
}; };
/* uncompressed test */ /* uncompressed test */
const byte sig4[] = { static const byte sig4[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72, 0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a, 0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74, 0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
@@ -5905,7 +5905,7 @@ int ed25519_test(void)
}; };
/* compressed prefix */ /* compressed prefix */
const byte sig5[] = { static const byte sig5[] = {
0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72, 0xe5,0x56,0x43,0x00,0xc3,0x60,0xac,0x72,
0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a, 0x90,0x86,0xe2,0xcc,0x80,0x6e,0x82,0x8a,
0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74, 0x84,0x87,0x7f,0x1e,0xb8,0xe5,0xd9,0x74,
@@ -5916,7 +5916,7 @@ int ed25519_test(void)
0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b 0x65,0x51,0x41,0x43,0x8e,0x7a,0x10,0x0b
}; };
const byte sig6[] = { static const byte sig6[] = {
0x0a,0xab,0x4c,0x90,0x05,0x01,0xb3,0xe2, 0x0a,0xab,0x4c,0x90,0x05,0x01,0xb3,0xe2,
0x4d,0x7c,0xdf,0x46,0x63,0x32,0x6a,0x3a, 0x4d,0x7c,0xdf,0x46,0x63,0x32,0x6a,0x3a,
0x87,0xdf,0x5e,0x48,0x43,0xb2,0xcb,0xdb, 0x87,0xdf,0x5e,0x48,0x43,0xb2,0xcb,0xdb,
@@ -5927,14 +5927,14 @@ int ed25519_test(void)
0xac,0x00,0xa9,0x70,0x4a,0x18,0x8a,0x03 0xac,0x00,0xa9,0x70,0x4a,0x18,0x8a,0x03
}; };
const byte* sigs[] = {sig1, sig2, sig3, sig4, sig5, sig6}; static const byte* sigs[] = {sig1, sig2, sig3, sig4, sig5, sig6};
const byte msg1[] = {}; static const byte msg1[] = {0x0 };
const byte msg2[] = {0x72}; static const byte msg2[] = {0x72};
const byte msg3[] = {0xAF,0x82}; static const byte msg3[] = {0xAF,0x82};
/* test of a 1024 byte long message */ /* test of a 1024 byte long message */
const byte msg4[] = { static const byte msg4[] = {
0x08,0xb8,0xb2,0xb7,0x33,0x42,0x42,0x43, 0x08,0xb8,0xb2,0xb7,0x33,0x42,0x42,0x43,
0x76,0x0f,0xe4,0x26,0xa4,0xb5,0x49,0x08, 0x76,0x0f,0xe4,0x26,0xa4,0xb5,0x49,0x08,
0x63,0x21,0x10,0xa6,0x6c,0x2f,0x65,0x91, 0x63,0x21,0x10,0xa6,0x6c,0x2f,0x65,0x91,
@@ -6065,9 +6065,9 @@ int ed25519_test(void)
0x40,0xb9,0x4c,0x00,0xa0,0xb9,0xd0 0x40,0xb9,0x4c,0x00,0xa0,0xb9,0xd0
}; };
const byte* msgs[] = {msg1, msg2, msg3, msg1, msg1, msg4}; static const byte* msgs[] = { msg1, msg2, msg3, msg1, msg1, msg4};
const word16 msgSz[] = {sizeof(msg1), sizeof(msg2), sizeof(msg3), static const word16 msgSz[] = {0 /*sizeof(msg1)*/, sizeof(msg2), sizeof(msg3),
sizeof(msg1), sizeof(msg1), sizeof(msg4)}; 0 /*sizeof(msg1)*/, 0 /*sizeof(msg1)*/, sizeof(msg4)};
/* create ed25519 keys */ /* create ed25519 keys */
wc_InitRng(&rng); wc_InitRng(&rng);