diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-01-05 09:34:52 -0700 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2018-01-05 09:58:48 -0700 |
| commit | a04741b693085f2a9bfdea0ed60d7955b0ee326f (patch) | |
| tree | dbd40bcd1ff79b4239428cbbf72125739d2d4e12 | |
| parent | 523971c63b424535fc172264dd2d52fac9d718cd (diff) | |
| download | hardware_samsung-a04741b693085f2a9bfdea0ed60d7955b0ee326f.tar.gz hardware_samsung-a04741b693085f2a9bfdea0ed60d7955b0ee326f.tar.bz2 hardware_samsung-a04741b693085f2a9bfdea0ed60d7955b0ee326f.zip | |
dtbhtool: Use BoringSSL instead of mincrypt
* mincrypt is gone as of LineageOS/android_system_core@6b11c13ae
Change-Id: Ia3b1dee747510daff45a345ae603181be5ab6023
| -rw-r--r-- | dtbhtool/Android.mk | 4 | ||||
| -rw-r--r-- | dtbhtool/mkbootimg.c | 26 | ||||
| -rw-r--r-- | dtbhtool/unpackbootimg.c | 1 |
3 files changed, 15 insertions, 16 deletions
diff --git a/dtbhtool/Android.mk b/dtbhtool/Android.mk index 100d608..7769e9c 100644 --- a/dtbhtool/Android.mk +++ b/dtbhtool/Android.mk @@ -12,7 +12,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := mkbootimg.c -LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libmincrypt +LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libcrypto_static LOCAL_MODULE := mkdtbhbootimg @@ -34,7 +34,7 @@ include $(BUILD_HOST_EXECUTABLE) include $(CLEAR_VARS) LOCAL_SRC_FILES := mkbootimg.c -LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libmincrypt libcutils libc +LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libcrypto_static libcutils libc LOCAL_MODULE := utility_mkdtbhbootimg LOCAL_MODULE_STEM := mkdtbhbootimg LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES diff --git a/dtbhtool/mkbootimg.c b/dtbhtool/mkbootimg.c index bb1528e..7b59139 100644 --- a/dtbhtool/mkbootimg.c +++ b/dtbhtool/mkbootimg.c @@ -36,7 +36,7 @@ #include <dtbimg.h> -#include "mincrypt/sha.h" +#include <openssl/sha.h> #include "bootimg.h" static void *load_file(const char *fn, unsigned *_sz) @@ -131,7 +131,7 @@ int main(int argc, char **argv) unsigned pagesize = 2048; int fd; SHA_CTX ctx; - uint8_t* sha; + uint8_t sha[SHA_DIGEST_LENGTH]; unsigned base = 0x10000000; unsigned kernel_offset = 0x00008000; unsigned ramdisk_offset = 0x01000000; @@ -283,20 +283,20 @@ int main(int argc, char **argv) /* put a hash of the contents in the header so boot images can be * differentiated based on their first 2k. */ - SHA_init(&ctx); - SHA_update(&ctx, kernel_data, hdr.kernel_size); - SHA_update(&ctx, &hdr.kernel_size, sizeof(hdr.kernel_size)); - SHA_update(&ctx, ramdisk_data, hdr.ramdisk_size); - SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); - SHA_update(&ctx, second_data, hdr.second_size); - SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); + SHA1_Init(&ctx); + SHA1_Update(&ctx, kernel_data, hdr.kernel_size); + SHA1_Update(&ctx, &hdr.kernel_size, sizeof(hdr.kernel_size)); + SHA1_Update(&ctx, ramdisk_data, hdr.ramdisk_size); + SHA1_Update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); + SHA1_Update(&ctx, second_data, hdr.second_size); + SHA1_Update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); if(dt_data) { - SHA_update(&ctx, dt_data, hdr.dt_size); - SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); + SHA1_Update(&ctx, dt_data, hdr.dt_size); + SHA1_Update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); } - sha = SHA_final(&ctx); + SHA1_Final(sha, &ctx); memcpy(hdr.id, sha, - SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE); + SHA_DIGEST_LENGTH > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_LENGTH); fd = open(bootimg, O_CREAT | O_TRUNC | O_WRONLY, 0644); if(fd < 0) { diff --git a/dtbhtool/unpackbootimg.c b/dtbhtool/unpackbootimg.c index aef2166..acc9659 100644 --- a/dtbhtool/unpackbootimg.c +++ b/dtbhtool/unpackbootimg.c @@ -7,7 +7,6 @@ #include <limits.h> #include <libgen.h> -#include "mincrypt/sha.h" #include "bootimg.h" typedef unsigned char byte; |