re-privatizes urcrypt__reverse and links directly to .o file for use in tests

Author: matthew-levan

Makefile.am

@@ -201,6 +201,7 @@ test_runner_CFLAGS = $(LIBCRYPTO_CFLAGS) \
 test_runner_LDFLAGS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib
 
 test_runner_LDADD = liburcrypt.la \
+        urcrypt/liburcrypt_la-util.o \
 		    $(LIBCRYPTO_LIBS) \
 		    $(LIBSECP256K1_LIBS) \
 		    $(LIBAES_SIV_LIBS)

tests/test_argon2.c

@@ -38,7 +38,7 @@ static int test_argon2i_reference_vector_1(void) {
   /* Expected output (reversed from reference) */
   uint8_t expected[32];
   hex_to_bytes("f6c4db4a54e2a370627aff3db6176b94a2a209a62c8e36152711802f7b30c694", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   error = urcrypt_argon2(
     urcrypt_argon2_i, 0x10, 1, 65536, 2,
@@ -69,7 +69,7 @@ static int test_argon2i_reference_vector_2(void) {
 
   uint8_t expected[32];
   hex_to_bytes("fd4dd83d762c49bdeaf57c47bdcd0c2f1babf863fdeb490df63ede9975fccf06", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   error = urcrypt_argon2(
     urcrypt_argon2_i, 0x10, 1, 256, 2,
@@ -100,7 +100,7 @@ static int test_argon2i_reference_vector_3(void) {
 
   uint8_t expected[32];
   hex_to_bytes("b6c11560a6a9d61eac706b79a2f97d68b4463aa3ad87e00c07e2b01e90c564fb", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   error = urcrypt_argon2(
     urcrypt_argon2_i, 0x10, 2, 256, 2,
@@ -131,7 +131,7 @@ static int test_argon2i_reference_vector_4(void) {
 
   uint8_t expected[32];
   hex_to_bytes("e9c902074b6754531a3a0be519e5baf404b30ce69b3f01ac3bf21229960109a3", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   error = urcrypt_argon2(
     urcrypt_argon2_i, 0x10, 1, 65536, 2,
@@ -162,7 +162,7 @@ static int test_argon2i_reference_vector_5(void) {
 
   uint8_t expected[32];
   hex_to_bytes("79a103b90fe8aef8570cb31fc8b22259778916f8336b7bdac3892569d4f1c497", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   error = urcrypt_argon2(
     urcrypt_argon2_i, 0x10, 1, 65536, 2,
@@ -299,7 +299,7 @@ static int test_blake2_reference_vector(void) {
   hex_to_bytes("786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419"
                "d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce",
                expected, 64);
-  urcrypt_reverse(64, expected);
+  urcrypt__reverse(64, expected);
 
   result = urcrypt_blake2(0, msg, 0, NULL, 64, out);
 
@@ -319,7 +319,7 @@ static int test_blake2_with_key(void) {
   char msg[] = "hello";
   uint8_t key[16] = {0};
   reverse_string(msg, 5);
-  urcrypt_reverse(16, key);
+  urcrypt__reverse(16, key);
 
   result = urcrypt_blake2(5, (uint8_t*)msg, 16, key, 32, out);
 
@@ -342,8 +342,8 @@ static int test_blake2_determinism(void) {
 
   reverse_string(msg1, 12);
   reverse_string(msg2, 12);
-  urcrypt_reverse(8, key1);
-  urcrypt_reverse(8, key2);
+  urcrypt__reverse(8, key1);
+  urcrypt__reverse(8, key2);
 
   result = urcrypt_blake2(12, (uint8_t*)msg1, 8, key1, 64, out1);
   ASSERT(result == 0, "first blake2 run should succeed");

tests/test_keccak.c

@@ -29,7 +29,7 @@ static int test_keccak_224_empty(void) {
 
   /* Ethereum test vector for empty string */
   hex_to_bytes("f71837502ba8e10837bdd8d365adb85591895602fc552b48b7390abd", expected, 28);
-  urcrypt_reverse(28, expected);
+  urcrypt__reverse(28, expected);
 
   int ret = urcrypt_keccak_224(NULL, 0, out);
 
@@ -49,7 +49,7 @@ static int test_keccak_224_41(void) {
 
   /* Ethereum test vector for 0x41 */
   hex_to_bytes("ef40b16ff375c834e91412489889f36538748c5454f4b02ba750b65e", expected, 28);
-  urcrypt_reverse(28, expected);
+  urcrypt__reverse(28, expected);
 
   int ret = urcrypt_keccak_224(&input, 1, out);
 
@@ -69,7 +69,7 @@ static int test_keccak_224_asd(void) {
 
   /* Ethereum test vector for "asd" */
   hex_to_bytes("c8cc732c0fa9004eb33d5d833ca22fbd27f21f1c53ef5670bc6779ca", expected, 28);
-  urcrypt_reverse(28, expected);
+  urcrypt__reverse(28, expected);
 
   int ret = urcrypt_keccak_224((const uint8_t*)message, strlen(message), out);
 
@@ -88,7 +88,7 @@ static int test_keccak_256_empty(void) {
 
   /* Ethereum test vector for empty string */
   hex_to_bytes("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   int ret = urcrypt_keccak_256(NULL, 0, out);
 
@@ -108,7 +108,7 @@ static int test_keccak_256_41(void) {
 
   /* Ethereum test vector for 0x41 */
   hex_to_bytes("03783fac2efed8fbc9ad443e592ee30e61d65f471140c10ca155e937b435b760", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   int ret = urcrypt_keccak_256(&input, 1, out);
 
@@ -128,7 +128,7 @@ static int test_keccak_256_asd(void) {
 
   /* Ethereum test vector for "asd" */
   hex_to_bytes("87c2d362de99f75a4f2755cdaaad2d11bf6cc65dc71356593c445535ff28f43d", expected, 32);
-  urcrypt_reverse(32, expected);
+  urcrypt__reverse(32, expected);
 
   int ret = urcrypt_keccak_256((const uint8_t*)message, strlen(message), out);
 
@@ -147,7 +147,7 @@ static int test_keccak_384_empty(void) {
 
   /* Ethereum test vector for empty string */
   hex_to_bytes("2c23146a63a29acf99e73b88f8c24eaa7dc60aa771780ccc006afbfa8fe2479b2dd2b21362337441ac12b515911957ff", expected, 48);
-  urcrypt_reverse(48, expected);
+  urcrypt__reverse(48, expected);
 
   int ret = urcrypt_keccak_384(NULL, 0, out);
 
@@ -167,7 +167,7 @@ static int test_keccak_384_41(void) {
 
   /* Ethereum test vector for 0x41 */
   hex_to_bytes("5c744cf4b4e3fb8967189e9744261a74f0ef31cdd8850554c737803585ac109039b73c22c50ea866c94debf1061f37a4", expected, 48);
-  urcrypt_reverse(48, expected);
+  urcrypt__reverse(48, expected);
 
   int ret = urcrypt_keccak_384(&input, 1, out);
 
@@ -187,7 +187,7 @@ static int test_keccak_384_asd(void) {
 
   /* Ethereum test vector for "asd" */
   hex_to_bytes("50efbfa7d5aa41e132c3cfba2bc503d0014eb5bf6d214420851bff0f284bc9a5383a49327600e2efc3ad9db3621decaf", expected, 48);
-  urcrypt_reverse(48, expected);
+  urcrypt__reverse(48, expected);
 
   int ret = urcrypt_keccak_384((const uint8_t*)message, strlen(message), out);
 
@@ -206,7 +206,7 @@ static int test_keccak_512_empty(void) {
 
   /* Ethereum test vector for empty string */
   hex_to_bytes("0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e", expected, 64);
-  urcrypt_reverse(64, expected);
+  urcrypt__reverse(64, expected);
 
   int ret = urcrypt_keccak_512(NULL, 0, out);
 
@@ -226,7 +226,7 @@ static int test_keccak_512_41(void) {
 
   /* Ethereum test vector for 0x41 */
   hex_to_bytes("421a35a60054e5f383b6137e43d44e998f496748cc77258240ccfaa8730b51f40cf47c1bc09c728a8cd4f096731298d51463f15af89543fed478053346260c38", expected, 64);
-  urcrypt_reverse(64, expected);
+  urcrypt__reverse(64, expected);
 
   int ret = urcrypt_keccak_512(&input, 1, out);
 
@@ -246,7 +246,7 @@ static int test_keccak_512_asd(void) {
 
   /* Ethereum test vector for "asd" */
   hex_to_bytes("3fb67c8b512d8ce73324db02dda2d19ebfb9d6a923c48fb503be3e0c7c752eb84e4da0818665133a27638dce8e9e8696a51b64b6b247354764609f22b4e65d35", expected, 64);
-  urcrypt_reverse(64, expected);
+  urcrypt__reverse(64, expected);
 
   int ret = urcrypt_keccak_512((const uint8_t*)message, strlen(message), out);
 

tests/test_ripemd.c

@@ -25,7 +25,7 @@ static int test_ripemd160_empty(void) {
   /* RIPEMD-160("") = 9c1185a5c5e9fc54612808977ee8f548b2258d31 (big-endian)
    * urcrypt reverses input and output, so we reverse the expected vector */
   hex_to_bytes("9c1185a5c5e9fc54612808977ee8f548b2258d31", expected, 20);
-  urcrypt_reverse(20, expected);
+  urcrypt__reverse(20, expected);
 
   int ret = urcrypt_ripemd160(message, 0, out);
 

tests/test_sha.c

@@ -31,7 +31,7 @@ static int test_sha1_empty(void) {
   /* SHA-1("") = da39a3ee5e6b4b0d3255bfef95601890afd80709 (big-endian)
    * urcrypt reverses input and output, so we reverse the expected vector */
   hex_to_bytes("da39a3ee5e6b4b0d3255bfef95601890afd80709", expected, 20);
-  urcrypt_reverse(20, expected);
+  urcrypt__reverse(20, expected);
 
   urcrypt_sha1(message, 0, out);
 
@@ -45,9 +45,9 @@ static int test_sha1_abc(void) {
   uint8_t out[20];
   uint8_t expected[20];
 
-  urcrypt_reverse(3, message);
+  urcrypt__reverse(3, message);
   hex_to_bytes("a9993e364706816aba3e25717850c26c9cd0d89d", expected, 20);
-  urcrypt_reverse(20, expected);
+  urcrypt__reverse(20, expected);
 
   urcrypt_sha1(message, 3, out);
 
@@ -64,9 +64,9 @@ static int test_sha1_longer(void) {
   uint8_t out[20];
   uint8_t expected[20];
 
-  urcrypt_reverse(56, message);
+  urcrypt__reverse(56, message);
   hex_to_bytes("84983e441c3bd26ebaae4aa1f95129e5e54670f1", expected, 20);
-  urcrypt_reverse(20, expected);
+  urcrypt__reverse(20, expected);
 
   urcrypt_sha1(message, 56, out);
 
@@ -83,9 +83,9 @@ static int test_sha1_longer2(void) {
   uint8_t out[20];
   uint8_t expected[20];
 
-  urcrypt_reverse(112, message);
+  urcrypt__reverse(112, message);
   hex_to_bytes("a49b2446a02c645bf419f995b67091253a04a259", expected, 20);
-  urcrypt_reverse(20, expected);
+  urcrypt__reverse(20, expected);
 
   urcrypt_sha1(message, 112, out);
 

urcrypt/aes_cbc.c

@@ -52,10 +52,10 @@ urcrypt__cbc_help(uint8_t **message_ptr,
   else {
     uint8_t *out = *message_ptr;
     size_t length = *length_ptr;
-    urcrypt_reverse(16, ivec);
-    urcrypt_reverse(length, out);
+    urcrypt__reverse(16, ivec);
+    urcrypt__reverse(length, out);
     AES_cbc_encrypt(out, out, length, key, ivec, enc);
-    urcrypt_reverse(length, out);
+    urcrypt__reverse(length, out);
     return 0;
   }
 }
@@ -69,7 +69,7 @@ urcrypt_aes_cbca_en(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(16, key);
+  urcrypt__reverse(16, key);
 
   if ( 0 != AES_set_encrypt_key(key, 128, &aes_key) ) {
     return -1;
@@ -89,7 +89,7 @@ urcrypt_aes_cbca_de(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(16, key);
+  urcrypt__reverse(16, key);
 
   if ( 0 != AES_set_decrypt_key(key, 128, &aes_key) ) {
     return -1;
@@ -109,7 +109,7 @@ urcrypt_aes_cbcb_en(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(24, key);
+  urcrypt__reverse(24, key);
 
   if ( 0 != AES_set_encrypt_key(key, 192, &aes_key) ) {
     return -1;
@@ -129,7 +129,7 @@ urcrypt_aes_cbcb_de(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(24, key);
+  urcrypt__reverse(24, key);
 
   if ( 0 != AES_set_decrypt_key(key, 192, &aes_key) ) {
     return -1;
@@ -149,7 +149,7 @@ urcrypt_aes_cbcc_en(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(32, key);
+  urcrypt__reverse(32, key);
 
   if ( 0 != AES_set_encrypt_key(key, 256, &aes_key) ) {
     return -1;
@@ -169,7 +169,7 @@ urcrypt_aes_cbcc_de(uint8_t **message_ptr,
 {
   AES_KEY aes_key;
 
-  urcrypt_reverse(32, key);
+  urcrypt__reverse(32, key);
 
   if ( 0 != AES_set_decrypt_key(key, 256, &aes_key) ) {
     return -1;