diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-13 10:04:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-13 10:04:17 -0400 |
| commit | 55fca74a5ba9bb0a101b247f421e81322b945a7b (patch) | |
| tree | d9b0680c0ca27982bd27f1f8cb733728ed3e7039 /include | |
| parent | 9885313b9add6c04cf3059958c5ee51a4f0ac930 (diff) | |
| parent | ec71cc34c1cef173d9f656d5cc9a2e698fae28fb (diff) | |
| download | u-boot-55fca74a5ba9bb0a101b247f421e81322b945a7b.tar.gz u-boot-55fca74a5ba9bb0a101b247f421e81322b945a7b.tar.xz u-boot-55fca74a5ba9bb0a101b247f421e81322b945a7b.zip | |
Merge branch '2020-10-12-assorted-encryption-changes'
- Fix verified boot on BE targets
- Add support for multiple required keys in verified boots
- Add support for Initialization Vectors in AES keys in FIT images
- Assorted fixes in the RSA code
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.h | 2 | ||||
| -rw-r--r-- | include/u-boot/aes.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/image.h b/include/image.h index 9a5a87dbf8..10995b8e24 100644 --- a/include/image.h +++ b/include/image.h @@ -1463,7 +1463,7 @@ struct cipher_algo { unsigned char **cipher, int *cipher_len); int (*add_cipher_data)(struct image_cipher_info *info, - void *keydest); + void *keydest, void *fit, int node_noffset); int (*decrypt)(struct image_cipher_info *info, const void *cipher, size_t cipher_len, diff --git a/include/u-boot/aes.h b/include/u-boot/aes.h index 32281041de..acbc50b9e6 100644 --- a/include/u-boot/aes.h +++ b/include/u-boot/aes.h @@ -13,7 +13,8 @@ int image_aes_encrypt(struct image_cipher_info *info, const unsigned char *data, int size, unsigned char **cipher, int *cipher_len); -int image_aes_add_cipher_data(struct image_cipher_info *info, void *keydest); +int image_aes_add_cipher_data(struct image_cipher_info *info, void *keydest, + void *fit, int node_noffset); #else int image_aes_encrypt(struct image_cipher_info *info, const unsigned char *data, int size, @@ -22,7 +23,8 @@ int image_aes_encrypt(struct image_cipher_info *info, return -ENXIO; } -int image_aes_add_cipher_data(struct image_cipher_info *info, void *keydest) +int image_aes_add_cipher_data(struct image_cipher_info *info, void *keydest, + void *fit, int node_noffset) { return -ENXIO; } |