diff options
| author | Mattias Nissler <mnissler@google.com> | 2016-03-31 16:29:37 +0200 |
|---|---|---|
| committer | Mattias Nissler <mnissler@google.com> | 2016-04-06 15:53:43 +0200 |
| commit | c494733146710a0182b5bd7bdbcb4e7118326288 (patch) | |
| tree | 5cfa19f2b9f59255074381fc5cfc0019683c5175 /libfec | |
| parent | 05e61bec49233712091be9d40ee46962170a118d (diff) | |
| download | extras-c494733146710a0182b5bd7bdbcb4e7118326288.tar.gz | |
Switch to BoringSSL for crypto.
Adjust code and dependencies to use BoringSSL + libcrypto_utils
instead of libmincrypt.
Change-Id: Id1b4ee538923e9dac68a7db2521b70007119c268
Diffstat (limited to 'libfec')
| -rw-r--r-- | libfec/Android.mk | 2 | ||||
| -rw-r--r-- | libfec/fec_private.h | 12 | ||||
| -rw-r--r-- | libfec/include/fec/io.h | 5 | ||||
| -rw-r--r-- | libfec/test/Android.mk | 1 |
4 files changed, 11 insertions, 9 deletions
diff --git a/libfec/Android.mk b/libfec/Android.mk index 45fb19ec..7dcdb25c 100644 --- a/libfec/Android.mk +++ b/libfec/Android.mk @@ -17,7 +17,7 @@ common_src_files := \ fec_process.cpp common_static_libraries := \ - libmincrypt \ + libcrypto_utils_static \ libcrypto_static \ libcutils \ libbase diff --git a/libfec/fec_private.h b/libfec/fec_private.h index bde30bd8..c54b5b17 100644 --- a/libfec/fec_private.h +++ b/libfec/fec_private.h @@ -23,17 +23,17 @@ #include <new> #include <pthread.h> #include <stdio.h> -#include <string> #include <string.h> +#include <string> #include <sys/syscall.h> #include <unistd.h> #include <vector> -#include <utils/Compat.h> -#include <mincrypt/rsa.h> -#include <openssl/sha.h> -#include <fec/io.h> +#include <crypto_utils/android_pubkey.h> #include <fec/ecc.h> +#include <fec/io.h> +#include <openssl/sha.h> +#include <utils/Compat.h> /* processing parameters */ #define WORK_MIN_THREADS 1 @@ -59,7 +59,7 @@ struct verity_header { uint32_t magic; uint32_t version; - uint8_t signature[RSANUMBYTES]; + uint8_t signature[ANDROID_PUBKEY_MODULUS_SIZE]; uint32_t length; }; diff --git a/libfec/include/fec/io.h b/libfec/include/fec/io.h index 1a077f32..8c0759b4 100644 --- a/libfec/include/fec/io.h +++ b/libfec/include/fec/io.h @@ -24,7 +24,8 @@ #include <stdio.h> #include <sys/types.h> #include <unistd.h> -#include <mincrypt/rsa.h> + +#include <crypto_utils/android_pubkey.h> #ifdef __cplusplus extern "C" { @@ -70,7 +71,7 @@ struct fec_ecc_metadata { struct fec_verity_metadata { bool disabled; uint64_t data_size; - uint8_t signature[RSANUMBYTES]; + uint8_t signature[ANDROID_PUBKEY_MODULUS_SIZE]; const char *table; uint32_t table_length; }; diff --git a/libfec/test/Android.mk b/libfec/test/Android.mk index a2bba554..d78c6d21 100644 --- a/libfec/test/Android.mk +++ b/libfec/test/Android.mk @@ -11,6 +11,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_LIBRARIES := \ libfec_host \ libfec_rs_host \ + libcrypto_utils_static \ libcrypto_static \ libext4_utils_host \ libsquashfs_utils_host \ |