diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 00:26:37 +0000 |
| commit | a04d78d392463df4e69a64360c952ffa5abd22f7 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /src/crypto/cmac | |
| parent | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff) | |
| download | external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.zip external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.gz external_boringssl-a04d78d392463df4e69a64360c952ffa5abd22f7.tar.bz2 | |
Revert "external/boringssl: sync with upstream."
This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.
This breaks some x86 builds.
Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
Diffstat (limited to 'src/crypto/cmac')
| -rw-r--r-- | src/crypto/cmac/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/crypto/cmac/cmac_test.cc | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/crypto/cmac/CMakeLists.txt b/src/crypto/cmac/CMakeLists.txt index bb3abc3..8ebd80c 100644 --- a/src/crypto/cmac/CMakeLists.txt +++ b/src/crypto/cmac/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(../../include) +include_directories(. .. ../../include) add_library( cmac @@ -12,8 +12,6 @@ add_executable( cmac_test cmac_test.cc - - $<TARGET_OBJECTS:test_support> ) target_link_libraries(cmac_test crypto) diff --git a/src/crypto/cmac/cmac_test.cc b/src/crypto/cmac/cmac_test.cc index 53f45d1..0f06860 100644 --- a/src/crypto/cmac/cmac_test.cc +++ b/src/crypto/cmac/cmac_test.cc @@ -19,13 +19,16 @@ #include <openssl/cmac.h> #include "../test/scoped_types.h" -#include "../test/test_util.h" -static void dump(const uint8_t *got, const uint8_t *want, size_t len) { - hexdump(stderr, "got :", got, len); - hexdump(stderr, "want:", want, len); - fflush(stderr); +static void dump(const uint8_t *got, const uint8_t *expected, size_t len) { + ScopedBIO bio(BIO_new_fp(stderr, 0 /* don't close */)); + + BIO_puts(bio.get(), "\nGot:\n"); + BIO_hexdump(bio.get(), got, len, 2 /* indent */); + BIO_puts(bio.get(), "Expected:\n"); + BIO_hexdump(bio.get(), expected, len, 2 /* indent */); + BIO_flush(bio.get()); } static int test(const char *name, const uint8_t *key, size_t key_len, |