diff options
| -rw-r--r-- | Makefile.mac | 2 | ||||
| -rw-r--r-- | node/Poly1305.cpp | 2 | ||||
| -rw-r--r-- | node/Poly1305.hpp | 2 | ||||
| -rw-r--r-- | selftest-crypto-vectors.hpp | 11 | ||||
| -rw-r--r-- | selftest.cpp | 23 |
5 files changed, 36 insertions, 4 deletions
diff --git a/Makefile.mac b/Makefile.mac index 8977de41..38e4bb9f 100644 --- a/Makefile.mac +++ b/Makefile.mac @@ -1,7 +1,7 @@ CC=gcc CXX=g++ -INCLUDES=-Iext/bin/libcrypto/include -Iext/jsoncpp/include +INCLUDES=-Iext/bin/libcrypto/include DEFS=-DZT_ARCH="x86_combined" -DZT_OSNAME="mac" -DZT_TRACE # Uncomment for a release optimized universal binary build diff --git a/node/Poly1305.cpp b/node/Poly1305.cpp index 542aab27..01f8de30 100644 --- a/node/Poly1305.cpp +++ b/node/Poly1305.cpp @@ -138,7 +138,7 @@ static int crypto_onetimeauth(unsigned char *out,const unsigned char *in,unsigne ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -void Poly1305::mac(void *auth,const void *data,unsigned int len,const void *key) +void Poly1305::compute(void *auth,const void *data,unsigned int len,const void *key) throw() { crypto_onetimeauth((unsigned char *)auth,(const unsigned char *)data,len,(const unsigned char *)key); diff --git a/node/Poly1305.hpp b/node/Poly1305.hpp index afe7439f..94e6078d 100644 --- a/node/Poly1305.hpp +++ b/node/Poly1305.hpp @@ -52,7 +52,7 @@ public: * @param len Length of data to authenticate in bytes * @param key 32-byte one-time use key to authenticate data (must not be reused) */ - static void mac(void *auth,const void *data,unsigned int len,const void *key) + static void compute(void *auth,const void *data,unsigned int len,const void *key) throw(); }; diff --git a/selftest-crypto-vectors.hpp b/selftest-crypto-vectors.hpp index 01a007a6..ed7e937b 100644 --- a/selftest-crypto-vectors.hpp +++ b/selftest-crypto-vectors.hpp @@ -7,6 +7,17 @@ static const unsigned char s20TV0Key[32] = { 0x0f,0x62,0xb5,0x08,0x5b,0xae,0x01, static const unsigned char s20TV0Iv[8] = { 0x28,0x8f,0xf6,0x5d,0xc4,0x2b,0x92,0xf9 }; static const unsigned char s20TV0Ks[64] = { 0x5e,0x5e,0x71,0xf9,0x01,0x99,0x34,0x03,0x04,0xab,0xb2,0x2a,0x37,0xb6,0x62,0x5b,0xf8,0x83,0xfb,0x89,0xce,0x3b,0x21,0xf5,0x4a,0x10,0xb8,0x10,0x66,0xef,0x87,0xda,0x30,0xb7,0x76,0x99,0xaa,0x73,0x79,0xda,0x59,0x5c,0x77,0xdd,0x59,0x54,0x2d,0xa2,0x08,0xe5,0x95,0x4f,0x89,0xe4,0x0e,0xb7,0xaa,0x80,0xa8,0x4a,0x61,0x76,0x66,0x3f }; +static const unsigned char poly1305TV0Input[32] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; +static const unsigned char poly1305TV0Key[32] = { 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x33,0x32,0x2d,0x62,0x79,0x74,0x65,0x20,0x6b,0x65,0x79,0x20,0x66,0x6f,0x72,0x20,0x50,0x6f,0x6c,0x79,0x31,0x33,0x30,0x35 }; +static const unsigned char poly1305TV0Tag[16] = { 0x49,0xec,0x78,0x09,0x0e,0x48,0x1e,0xc6,0xc2,0x6b,0x33,0xb9,0x1c,0xcc,0x03,0x07 }; + +static const unsigned char poly1305TV1Input[12] = { 0x48,0x65,0x6c,0x6c,0x6f,0x20,0x77,0x6f,0x72,0x6c,0x64,0x21 }; +static const unsigned char poly1305TV1Key[32] = { 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x33,0x32,0x2d,0x62,0x79,0x74,0x65,0x20,0x6b,0x65,0x79,0x20,0x66,0x6f,0x72,0x20,0x50,0x6f,0x6c,0x79,0x31,0x33,0x30,0x35 }; +static const unsigned char poly1305TV1Tag[16] = { 0xa6,0xf7,0x45,0x00,0x8f,0x81,0xc9,0x16,0xa2,0x0d,0xcc,0x74,0xee,0xf2,0xb2,0xf0 }; + +static const char *sha512TV0Input = "supercalifragilisticexpealidocious"; +static const unsigned char sha512TV0Digest[64] = { 0x18,0x2a,0x85,0x59,0x69,0xe5,0xd3,0xe6,0xcb,0xf6,0x05,0x24,0xad,0xf2,0x88,0xd1,0xbb,0xf2,0x52,0x92,0x81,0x24,0x31,0xf6,0xd2,0x52,0xf1,0xdb,0xc1,0xcb,0x44,0xdf,0x21,0x57,0x3d,0xe1,0xb0,0x6b,0x68,0x75,0x95,0x9f,0x3b,0x6f,0x87,0xb1,0x13,0x81,0xd0,0xbc,0x79,0x2c,0x43,0x3a,0x13,0x55,0x3c,0xe0,0x84,0xc2,0x92,0x55,0x31,0x1c }; + struct C25519TestVector { unsigned char pub1[64]; diff --git a/selftest.cpp b/selftest.cpp index 6892f07c..1bdb3b05 100644 --- a/selftest.cpp +++ b/selftest.cpp @@ -70,7 +70,28 @@ static int testCrypto() unsigned char buf1[16384]; unsigned char buf2[sizeof(buf1)],buf3[sizeof(buf1)]; - std::cout << "[crypto] Testing C25519 against test vectors... "; std::cout.flush(); + std::cout << "[crypto] Testing SHA-512... "; std::cout.flush(); + SHA512::hash(buf1,sha512TV0Input,strlen(sha512TV0Input)); + if (memcmp(buf1,sha512TV0Digest,64)) { + std::cout << "FAIL" << std::endl; + return -1; + } + std::cout << "PASS" << std::endl; + + std::cout << "[crypto] Testing Poly1305... "; std::cout.flush(); + Poly1305::compute(buf1,poly1305TV0Input,sizeof(poly1305TV0Input),poly1305TV0Key); + if (memcmp(buf1,poly1305TV0Tag,16)) { + std::cout << "FAIL (1)" << std::endl; + return -1; + } + Poly1305::compute(buf1,poly1305TV1Input,sizeof(poly1305TV1Input),poly1305TV1Key); + if (memcmp(buf1,poly1305TV1Tag,16)) { + std::cout << "FAIL (2)" << std::endl; + return -1; + } + std::cout << "PASS" << std::endl; + + std::cout << "[crypto] Testing C25519 and Ed25519 against test vectors... "; std::cout.flush(); for(int k=0;k<ZT_NUM_C25519_TEST_VECTORS;++k) { C25519::Pair p1,p2; memcpy(p1.pub.data,C25519_TEST_VECTORS[k].pub1,p1.pub.size()); |