diff options
author | Brian Smith <brian@briansmith.org> | 2015-03-02 04:47:32 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-04-13 23:25:45 +0300 |
commit | 6e8fbfecd021cf1b9de1aa5084d3e1f72585b081 (patch) | |
tree | 83e7168551aebffa04b6ce396ff41adf23b02c8a /crypto/digest | |
parent | 9da82c1cccd3407c66724a9314c222f75385e34f (diff) |
Remove crypto/obj dependencies from low-level crypto tests.
The only dependency the low-level crypto modules have on code in
crypto/obj is their use of OBJ_nid2sn, which is trivial to avoid.
This facilitates future simplification of crypto/obj, including
possibly the removal of functions like OBJ_nid2sn and the complex
build infrastructure that supports them.
This change also removes EVP_CIPHER_name and EVP_MD_name.
Change-Id: I34ce7dc7e58d5c08b52f95d25eba3963590cf2f7
Reviewed-on: https://boringssl-review.googlesource.com/3932
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/digest')
-rw-r--r-- | crypto/digest/digest.c | 2 | ||||
-rw-r--r-- | crypto/digest/digest_test.cc | 100 |
2 files changed, 57 insertions, 45 deletions
diff --git a/crypto/digest/digest.c b/crypto/digest/digest.c index 3897c605..e32eafdc 100644 --- a/crypto/digest/digest.c +++ b/crypto/digest/digest.c @@ -68,8 +68,6 @@ int EVP_MD_type(const EVP_MD *md) { return md->type; } -const char *EVP_MD_name(const EVP_MD *md) { return OBJ_nid2sn(md->type); } - uint32_t EVP_MD_flags(const EVP_MD *md) { return md->flags; } size_t EVP_MD_size(const EVP_MD *md) { return md->md_size; } diff --git a/crypto/digest/digest_test.cc b/crypto/digest/digest_test.cc index 82ca8eeb..dcb569c7 100644 --- a/crypto/digest/digest_test.cc +++ b/crypto/digest/digest_test.cc @@ -26,12 +26,28 @@ #include "../test/scoped_types.h" -struct TestVector { +struct MD { + // name is the name of the digest. + const char* name; // md_func is the digest to test. - const EVP_MD *(*md_func)(void); + const EVP_MD *(*func)(void); // one_shot_func is the convenience one-shot version of the // digest. uint8_t *(*one_shot_func)(const uint8_t *, size_t, uint8_t *); +}; + +static const MD md4 = { "MD4", &EVP_md4, nullptr }; +static const MD md5 = { "MD5", &EVP_md5, &MD5 }; +static const MD sha1 = { "SHA1", &EVP_sha1, &SHA1 }; +static const MD sha224 = { "SHA224", &EVP_sha224, &SHA224 }; +static const MD sha256 = { "SHA256", &EVP_sha256, &SHA256 }; +static const MD sha384 = { "SHA384", &EVP_sha384, &SHA384 }; +static const MD sha512 = { "SHA512", &EVP_sha512, &SHA512 }; +static const MD md5_sha1 = { "MD5-SHA1", &EVP_md5_sha1, nullptr }; + +struct TestVector { + // md is the digest to test. + const MD &md; // input is a NUL-terminated string to hash. const char *input; // repeat is the number of times to repeat input. @@ -43,80 +59,78 @@ struct TestVector { static const TestVector kTestVectors[] = { // MD4 tests, from RFC 1320. (crypto/md4 does not provide a // one-shot MD4 function.) - { &EVP_md4, NULL, "", 1, "31d6cfe0d16ae931b73c59d7e0c089c0" }, - { &EVP_md4, NULL, "a", 1, "bde52cb31de33e46245e05fbdbd6fb24" }, - { &EVP_md4, NULL, "abc", 1, "a448017aaf21d8525fc10ae87aa6729d" }, - { &EVP_md4, NULL, "message digest", 1, - "d9130a8164549fe818874806e1c7014b" }, - { &EVP_md4, NULL, "abcdefghijklmnopqrstuvwxyz", 1, + { md4, "", 1, "31d6cfe0d16ae931b73c59d7e0c089c0" }, + { md4, "a", 1, "bde52cb31de33e46245e05fbdbd6fb24" }, + { md4, "abc", 1, "a448017aaf21d8525fc10ae87aa6729d" }, + { md4, "message digest", 1, "d9130a8164549fe818874806e1c7014b" }, + { md4, "abcdefghijklmnopqrstuvwxyz", 1, "d79e1c308aa5bbcdeea8ed63df412da9" }, - { &EVP_md4, NULL, + { md4, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 1, "043f8582f241db351ce627e153e7f0e4" }, - { &EVP_md4, NULL, "1234567890", 8, "e33b4ddc9c38f2199c3e7b164fcc0536" }, + { md4, "1234567890", 8, "e33b4ddc9c38f2199c3e7b164fcc0536" }, // MD5 tests, from RFC 1321. - { &EVP_md5, &MD5, "", 1, "d41d8cd98f00b204e9800998ecf8427e" }, - { &EVP_md5, &MD5, "a", 1, "0cc175b9c0f1b6a831c399e269772661" }, - { &EVP_md5, &MD5, "abc", 1, "900150983cd24fb0d6963f7d28e17f72" }, - { &EVP_md5, &MD5, "message digest", 1, "f96b697d7cb7938d525a2f31aaf161d0" }, - { &EVP_md5, &MD5, "abcdefghijklmnopqrstuvwxyz", 1, + { md5, "", 1, "d41d8cd98f00b204e9800998ecf8427e" }, + { md5, "a", 1, "0cc175b9c0f1b6a831c399e269772661" }, + { md5, "abc", 1, "900150983cd24fb0d6963f7d28e17f72" }, + { md5, "message digest", 1, "f96b697d7cb7938d525a2f31aaf161d0" }, + { md5, "abcdefghijklmnopqrstuvwxyz", 1, "c3fcd3d76192e4007dfb496cca67e13b" }, - { &EVP_md5, &MD5, + { md5, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 1, "d174ab98d277d9f5a5611c2c9f419d9f" }, - { &EVP_md5, &MD5, "1234567890", 8, "57edf4a22be3c955ac49da2e2107b67a" }, + { md5, "1234567890", 8, "57edf4a22be3c955ac49da2e2107b67a" }, // SHA-1 tests, from RFC 3174. - { &EVP_sha1, &SHA1, "abc", 1, "a9993e364706816aba3e25717850c26c9cd0d89d" }, - { &EVP_sha1, &SHA1, + { sha1, "abc", 1, "a9993e364706816aba3e25717850c26c9cd0d89d" }, + { sha1, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, "84983e441c3bd26ebaae4aa1f95129e5e54670f1" }, - { &EVP_sha1, &SHA1, "a", 1000000, - "34aa973cd4c4daa4f61eeb2bdbad27316534016f" }, - { &EVP_sha1, &SHA1, + { sha1, "a", 1000000, "34aa973cd4c4daa4f61eeb2bdbad27316534016f" }, + { sha1, "0123456701234567012345670123456701234567012345670123456701234567", 10, "dea356a2cddd90c7a7ecedc5ebb563934f460452" }, // SHA-224 tests, from RFC 3874. - { &EVP_sha224, &SHA224, "abc", 1, + { sha224, "abc", 1, "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7" }, - { &EVP_sha224, &SHA224, + { sha224, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525" }, - { &EVP_sha224, &SHA224, + { sha224, "a", 1000000, "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67" }, // SHA-256 tests, from NIST. - { &EVP_sha256, &SHA256, "abc", 1, + { sha256, "abc", 1, "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" }, - { &EVP_sha256, &SHA256, + { sha256, "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 1, "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1" }, // SHA-384 tests, from NIST. - { &EVP_sha384, &SHA384, "abc", 1, + { sha384, "abc", 1, "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed" "8086072ba1e7cc2358baeca134c825a7" }, - { &EVP_sha384, &SHA384, + { sha384, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", 1, "09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712" "fcc7c71a557e2db966c3e9fa91746039" }, // SHA-512 tests, from NIST. - { &EVP_sha512, &SHA512, "abc", 1, + { sha512, "abc", 1, "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a" "2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f" }, - { &EVP_sha512, &SHA512, + { sha512, "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu", 1, "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018" "501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909" }, // MD5-SHA1 tests. - { &EVP_md5_sha1, NULL, "abc", 1, + { md5_sha1, "abc", 1, "900150983cd24fb0d6963f7d28e17f72a9993e364706816aba3e25717850c26c9cd0d89d" }, }; @@ -135,7 +149,7 @@ static bool CompareDigest(const TestVector *test, if (strcmp(digest_hex, test->expected_hex) != 0) { fprintf(stderr, "%s(\"%s\" * %d) = %s; want %s\n", - EVP_MD_name(test->md_func()), test->input, (int)test->repeat, + test->md.name, test->input, (int)test->repeat, digest_hex, test->expected_hex); return false; } @@ -147,7 +161,7 @@ static int TestDigest(const TestVector *test) { ScopedEVP_MD_CTX ctx; // Test the input provided. - if (!EVP_DigestInit_ex(ctx.get(), test->md_func(), NULL)) { + if (!EVP_DigestInit_ex(ctx.get(), test->md.func(), NULL)) { fprintf(stderr, "EVP_DigestInit_ex failed\n"); return false; } @@ -168,7 +182,7 @@ static int TestDigest(const TestVector *test) { } // Test the input one character at a time. - if (!EVP_DigestInit_ex(ctx.get(), test->md_func(), NULL)) { + if (!EVP_DigestInit_ex(ctx.get(), test->md.func(), NULL)) { fprintf(stderr, "EVP_DigestInit_ex failed\n"); return false; } @@ -188,7 +202,7 @@ static int TestDigest(const TestVector *test) { fprintf(stderr, "EVP_DigestFinal_ex failed\n"); return false; } - if (digest_len != EVP_MD_size(test->md_func())) { + if (digest_len != EVP_MD_size(test->md.func())) { fprintf(stderr, "EVP_MD_size output incorrect\n"); return false; } @@ -197,21 +211,21 @@ static int TestDigest(const TestVector *test) { } // Test the one-shot function. - if (test->one_shot_func && test->repeat == 1) { - uint8_t *out = test->one_shot_func((const uint8_t *)test->input, - strlen(test->input), digest); + if (test->md.one_shot_func && test->repeat == 1) { + uint8_t *out = test->md.one_shot_func((const uint8_t *)test->input, + strlen(test->input), digest); if (out != digest) { fprintf(stderr, "one_shot_func gave incorrect return\n"); return false; } - if (!CompareDigest(test, digest, EVP_MD_size(test->md_func()))) { + if (!CompareDigest(test, digest, EVP_MD_size(test->md.func()))) { return false; } // Test the deprecated static buffer variant, until it's removed. - out = test->one_shot_func((const uint8_t *)test->input, strlen(test->input), - NULL); - if (!CompareDigest(test, out, EVP_MD_size(test->md_func()))) { + out = test->md.one_shot_func((const uint8_t *)test->input, + strlen(test->input), NULL); + if (!CompareDigest(test, out, EVP_MD_size(test->md.func()))) { return false; } } |