(murena) avb: add murena public key
Change-Id: If1f1f3b6f861bdb124d737418c8396829dc4b1aa
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 7bf0170..85fb1d8 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -84,6 +84,7 @@
else
BOARD_BOOTLOADER_VERSION := unknown
endif
+BOARD_BOOTLOADER_VERSION := $(BOARD_BOOTLOADER_VERSION)-murena
ifneq ($(TARGET_BOARD_TYPE),auto)
TARGET_BOARD_TYPE_AUTO := TARGET_BOARD_TYPE_AUTO=0
diff --git a/QcomModulePkg/Library/avb/OEMPublicKey.h b/QcomModulePkg/Library/avb/OEMPublicKey.h
index a0e7f52..09d1f2c 100644
--- a/QcomModulePkg/Library/avb/OEMPublicKey.h
+++ b/QcomModulePkg/Library/avb/OEMPublicKey.h
@@ -101,4 +101,101 @@
0xa2,0x61,0x2c,0xf9,0x6f,0xf4,0xf3,0xb7
};
+static const char MurenaPublicKey[] = {
+ 0x00, 0x00, 0x10, 0x00, 0xb8, 0x0b, 0xfd, 0x49, 0xb6, 0x3d, 0xe2,
+ 0x49, 0xb0, 0x82, 0xf2, 0x03, 0xe1, 0xe3, 0xbf, 0xce, 0xb2, 0xd9,
+ 0xe9, 0xb2, 0x04, 0xd7, 0xe8, 0xa5, 0x81, 0x49, 0xa7, 0x62, 0xe8,
+ 0x12, 0xf3, 0xa3, 0x1c, 0x28, 0xca, 0x28, 0x85, 0x06, 0x3f, 0xf0,
+ 0x2d, 0x34, 0x76, 0x8d, 0x75, 0x35, 0x72, 0x71, 0xc9, 0x9b, 0xe2,
+ 0x74, 0x69, 0x08, 0x72, 0x69, 0xac, 0x39, 0xff, 0xf9, 0xd3, 0xb4,
+ 0xa1, 0x66, 0xb5, 0x93, 0x8f, 0xe0, 0xe5, 0x76, 0x97, 0x0b, 0x5a,
+ 0xeb, 0x8d, 0x43, 0x74, 0xcd, 0xc3, 0x02, 0x53, 0xec, 0x35, 0x21,
+ 0x59, 0x39, 0x40, 0x1b, 0xa0, 0x81, 0x88, 0x18, 0x77, 0xf8, 0xae,
+ 0xc0, 0xaa, 0xad, 0x78, 0x90, 0x96, 0xda, 0x61, 0x2e, 0xf9, 0x71,
+ 0x18, 0xa9, 0x3e, 0xdc, 0x2e, 0xcb, 0xca, 0xcf, 0x91, 0xbe, 0xc0,
+ 0xdf, 0x65, 0xd1, 0xbf, 0x45, 0x2d, 0x5e, 0x90, 0x9c, 0x32, 0x59,
+ 0xbe, 0xc8, 0xf1, 0xea, 0x0c, 0x72, 0xfc, 0x69, 0x02, 0xdd, 0x24,
+ 0x59, 0xef, 0x47, 0x96, 0xeb, 0xf6, 0xb1, 0x86, 0xea, 0x0d, 0xa2,
+ 0xfb, 0xec, 0x93, 0x60, 0x5c, 0x54, 0xc0, 0x80, 0x45, 0x40, 0xf5,
+ 0x72, 0x76, 0xda, 0x55, 0x7d, 0x22, 0x45, 0x22, 0x81, 0x39, 0xdc,
+ 0xf2, 0xff, 0xff, 0xc5, 0x05, 0xc7, 0x3a, 0x83, 0x19, 0xf5, 0x49,
+ 0x0a, 0x26, 0x82, 0xda, 0x91, 0x02, 0x71, 0x95, 0xc0, 0xba, 0xa5,
+ 0x79, 0xca, 0x83, 0x51, 0x5d, 0x7a, 0xae, 0xc9, 0x30, 0xbd, 0xdf,
+ 0x4e, 0x07, 0xff, 0xa2, 0xb5, 0xab, 0x87, 0x64, 0xbc, 0x04, 0x0f,
+ 0xbc, 0x3d, 0x31, 0x2f, 0x16, 0xcf, 0x2f, 0x83, 0xae, 0xf5, 0x2c,
+ 0xbf, 0x42, 0x4d, 0xc3, 0xbd, 0xfc, 0x03, 0x31, 0xf2, 0x93, 0xab,
+ 0xa6, 0xde, 0x2f, 0x71, 0x87, 0x33, 0x6f, 0xe2, 0x80, 0xa8, 0xbe,
+ 0x0f, 0x4a, 0x41, 0xb2, 0x51, 0x8b, 0xfe, 0x04, 0x29, 0x16, 0x08,
+ 0xb2, 0x79, 0x8d, 0x16, 0x01, 0x8d, 0x45, 0x31, 0xcd, 0x53, 0xfd,
+ 0xc8, 0x5f, 0x61, 0xbd, 0xf2, 0xe1, 0x5d, 0xd9, 0x2c, 0x65, 0x40,
+ 0x69, 0x1c, 0x95, 0x61, 0x31, 0x59, 0x69, 0xcf, 0x13, 0x0b, 0xdc,
+ 0x98, 0xe3, 0xc9, 0xf6, 0x38, 0xc3, 0xf4, 0x07, 0xcc, 0xff, 0x83,
+ 0xea, 0x13, 0x4f, 0x6c, 0x5e, 0x50, 0x9f, 0xf4, 0x0b, 0x20, 0x1d,
+ 0x6d, 0xbe, 0xe9, 0x56, 0x18, 0x99, 0xdd, 0x4c, 0x5a, 0x82, 0x58,
+ 0x1a, 0x5a, 0xa2, 0xc0, 0xe2, 0xe0, 0x88, 0xe0, 0x40, 0xea, 0x11,
+ 0xae, 0x0e, 0x3a, 0x27, 0x28, 0x11, 0x43, 0x22, 0xf3, 0xda, 0xcf,
+ 0xe8, 0x57, 0xae, 0x86, 0x3a, 0x39, 0xb5, 0xd6, 0xee, 0x6e, 0xaa,
+ 0x44, 0x01, 0x34, 0x58, 0x87, 0x30, 0xa3, 0xa8, 0x66, 0x8b, 0xa1,
+ 0x89, 0xa1, 0xf8, 0x30, 0xb2, 0xe8, 0x74, 0x97, 0x8e, 0xcd, 0x98,
+ 0xfa, 0xeb, 0x19, 0xc6, 0x25, 0x24, 0x9a, 0x79, 0x18, 0xf1, 0xed,
+ 0x34, 0xec, 0x5a, 0xe2, 0x05, 0xa3, 0x61, 0x64, 0x67, 0x08, 0x7c,
+ 0xae, 0xfd, 0xd4, 0xe9, 0x26, 0x1a, 0xba, 0xdb, 0xf0, 0xaf, 0x57,
+ 0x1b, 0x7a, 0xcc, 0x3a, 0xee, 0xb1, 0x2e, 0xff, 0x8a, 0xfa, 0xe9,
+ 0xdf, 0xb0, 0x7f, 0x7b, 0xb5, 0x78, 0x31, 0x7b, 0x0e, 0xed, 0xd8,
+ 0x96, 0x32, 0xf9, 0xe0, 0xd0, 0x13, 0xd6, 0xf2, 0x9b, 0xca, 0xeb,
+ 0x40, 0x24, 0xc9, 0xdb, 0xac, 0x8e, 0xb8, 0x26, 0x11, 0x38, 0x2b,
+ 0x82, 0x5f, 0xb0, 0xd7, 0xd1, 0x56, 0x1d, 0x72, 0x26, 0x83, 0x58,
+ 0x01, 0xbf, 0xe0, 0x23, 0x5a, 0xc7, 0xa9, 0x51, 0x53, 0x12, 0x0a,
+ 0xe2, 0xe4, 0x44, 0x04, 0x1b, 0x2e, 0xe6, 0xbe, 0x7f, 0x74, 0x75,
+ 0x63, 0xce, 0x08, 0xe5, 0x00, 0xd8, 0xbd, 0xe5, 0x69, 0xf5, 0x9c,
+ 0x55, 0xdc, 0xdd, 0x73, 0x65, 0x07, 0xcd, 0x7a, 0x94, 0xb2, 0x6f,
+ 0x2a, 0x7b, 0x07, 0x68, 0xd4, 0xa8, 0x2f, 0x8d, 0x6c, 0x10, 0x37,
+ 0x61, 0x42, 0x16, 0x2d, 0x08, 0x84, 0x88, 0x02, 0xd8, 0xb9, 0xdc,
+ 0x1e, 0xe9, 0x76, 0x08, 0xa2, 0x24, 0xb3, 0x75, 0x7e, 0xf0, 0x64,
+ 0xd2, 0xc7, 0xaa, 0x9c, 0x1b, 0x5d, 0x03, 0xe5, 0xc1, 0x60, 0xd7,
+ 0x42, 0xf0, 0x11, 0x95, 0xd8, 0xf2, 0xb1, 0x0b, 0x1c, 0x46, 0x9a,
+ 0x6e, 0x31, 0x9d, 0x1b, 0xdf, 0x37, 0x71, 0x58, 0x2d, 0x60, 0x0d,
+ 0xc5, 0xfb, 0x37, 0xa2, 0x2a, 0x09, 0xca, 0x15, 0xd2, 0xc8, 0x2b,
+ 0x59, 0x60, 0x9c, 0x3c, 0xc2, 0xcb, 0x22, 0x10, 0x3e, 0x42, 0x2c,
+ 0xb4, 0x10, 0xd1, 0xc4, 0xaa, 0xd6, 0x8d, 0x0e, 0xee, 0x07, 0xf6,
+ 0x6d, 0x56, 0xae, 0x37, 0xbf, 0xc5, 0xfe, 0x95, 0xae, 0x32, 0x27,
+ 0x6c, 0xdf, 0x80, 0xd9, 0x2a, 0x87, 0x8c, 0x5d, 0x5f, 0x11, 0xcb,
+ 0x46, 0xc6, 0x4a, 0x5b, 0x0c, 0x29, 0xe1, 0x4b, 0xb5, 0xd9, 0x92,
+ 0x9b, 0x73, 0xfd, 0x6e, 0x19, 0x06, 0x77, 0x07, 0x0b, 0x17, 0x0a,
+ 0xf8, 0x9d, 0xab, 0xca, 0xab, 0x98, 0xb3, 0xbc, 0x26, 0xd7, 0x0c,
+ 0xc0, 0x08, 0x5d, 0x87, 0x3a, 0x61, 0xba, 0xbb, 0x32, 0x5b, 0x5e,
+ 0xb9, 0x39, 0x07, 0xaf, 0x06, 0x57, 0x4c, 0xa8, 0x26, 0x03, 0x87,
+ 0x05, 0x03, 0xc3, 0x3a, 0xd1, 0x66, 0xfd, 0x4b, 0x04, 0x54, 0x07,
+ 0xe6, 0xaa, 0x73, 0xd9, 0xcc, 0xe0, 0x22, 0x12, 0x70, 0xca, 0x45,
+ 0x49, 0xd0, 0x92, 0x13, 0x6c, 0x4e, 0xb5, 0x7a, 0xb0, 0x75, 0xcd,
+ 0xf1, 0x6b, 0x52, 0xf3, 0x1d, 0x78, 0x86, 0xfc, 0xac, 0x0e, 0x78,
+ 0x5f, 0x1a, 0xda, 0x24, 0x40, 0xdb, 0xbf, 0x50, 0x56, 0xee, 0xe5,
+ 0xdc, 0x18, 0x4a, 0x9c, 0x43, 0x03, 0x71, 0xda, 0xd9, 0x62, 0x56,
+ 0x68, 0xa7, 0x13, 0xc3, 0xd3, 0xe3, 0x10, 0x24, 0xeb, 0xb8, 0xed,
+ 0xf3, 0xff, 0xed, 0x42, 0xfc, 0x64, 0xbe, 0x8e, 0xb1, 0x95, 0xdc,
+ 0x67, 0xef, 0x32, 0xef, 0x44, 0x84, 0x4e, 0x4a, 0x1e, 0x2e, 0xb8,
+ 0x5c, 0x31, 0xff, 0xe1, 0x5e, 0x09, 0xc0, 0xda, 0xf7, 0xc6, 0xe6,
+ 0x20, 0x94, 0x67, 0xec, 0x5b, 0x69, 0x32, 0xc6, 0x0a, 0xf1, 0xcd,
+ 0xa3, 0xe6, 0xbd, 0xd4, 0x24, 0x99, 0xef, 0x6c, 0xc3, 0x7f, 0xc4,
+ 0x2c, 0x9c, 0x37, 0x53, 0xfb, 0xe9, 0xdc, 0xcb, 0x21, 0x57, 0x7d,
+ 0xad, 0x05, 0x14, 0x8c, 0x00, 0x90, 0x9b, 0x47, 0xfe, 0x0b, 0xb3,
+ 0xcb, 0xbc, 0x97, 0x51, 0xc5, 0x08, 0x10, 0xa2, 0xa9, 0x6f, 0x54,
+ 0xca, 0x44, 0x5c, 0xc9, 0xac, 0x8f, 0xb4, 0x2b, 0x69, 0x61, 0x38,
+ 0xec, 0x0d, 0xe9, 0x84, 0x07, 0xf3, 0xe9, 0xd9, 0x8e, 0x92, 0xd1,
+ 0x28, 0x36, 0x6b, 0x30, 0x40, 0xd1, 0x0d, 0x87, 0xd3, 0x3c, 0x21,
+ 0x65, 0xe6, 0xa8, 0xcc, 0x42, 0x20, 0x79, 0xb9, 0x15, 0xdc, 0xaa,
+ 0x07, 0x21, 0xcb, 0x73, 0xba, 0xb9, 0x97, 0xd4, 0xaa, 0x6a, 0x44,
+ 0xf0, 0x7b, 0xb4, 0x2a, 0xf7, 0x21, 0x7b, 0xc3, 0xcd, 0xbf, 0x15,
+ 0x02, 0x99, 0x82, 0x0e, 0xb6, 0x33, 0xcb, 0xd3, 0x7d, 0x5b, 0xb4,
+ 0x6f, 0x03, 0xa5, 0x61, 0xe0, 0x94, 0x5a, 0x16, 0x0d, 0x54, 0xab,
+ 0x19, 0x0b, 0x70, 0xd9, 0x60, 0x0f, 0x2e, 0x23, 0xe4, 0x13, 0x89,
+ 0xef, 0xba, 0x7f, 0x11, 0x36, 0xfd, 0xdc, 0x4c, 0x50, 0x83, 0x7a,
+ 0x3e, 0xbc, 0x29, 0x51, 0x66, 0x55, 0xb5, 0xb4, 0x23, 0xc3, 0xcc,
+ 0x96, 0x87, 0x58, 0x94, 0x07, 0x51, 0xaf, 0xff, 0xa2, 0x6f, 0xcc,
+ 0x56, 0x5f, 0x3f, 0x22, 0xcb, 0xf8, 0xa5, 0x6a, 0x20, 0x2d, 0x3c,
+ 0x83, 0x65, 0x1b, 0x8d, 0x6b, 0xa8, 0x6f, 0x4d, 0xe3, 0x10, 0x08,
+ 0x92, 0xa2, 0xd4, 0x63, 0xe8, 0xa8, 0xb1, 0xe3, 0x66, 0xb2, 0x1a,
+ 0x59, 0x23, 0xdb, 0xe0, 0xb6, 0xf9, 0x7b, 0xf1, 0xf0
+};
+
#endif /* __OEM_PUBLIC_KEY_H__ */
diff --git a/QcomModulePkg/Library/avb/libavb/avb_ops.c b/QcomModulePkg/Library/avb/libavb/avb_ops.c
index fd5c828..24a2c63 100644
--- a/QcomModulePkg/Library/avb/libavb/avb_ops.c
+++ b/QcomModulePkg/Library/avb/libavb/avb_ops.c
@@ -352,6 +352,9 @@
} else if (PublicKeyLength == ARRAY_SIZE(OEMPublicKey) &&
CompareMem(PublicKeyData, OEMPublicKey, PublicKeyLength) == 0) {
*OutIsTrusted = true;
+ } else if (PublicKeyLength == ARRAY_SIZE(MurenaPublicKey) &&
+ CompareMem(PublicKeyData, MurenaPublicKey, PublicKeyLength) == 0) {
+ *OutIsTrusted = true;
} else {
*OutIsTrusted = false;
SetMem(UserData->PublicKey, ARRAY_SIZE(UserData->PublicKey), 0);
@@ -411,6 +414,9 @@
} else if (PublicKeyLength == ARRAY_SIZE (OEMPublicKey) &&
CompareMem(PublicKeyData, OEMPublicKey, PublicKeyLength) == 0) {
*OutIsTrusted = true;
+ } else if (PublicKeyLength == ARRAY_SIZE (MurenaPublicKey) &&
+ CompareMem(PublicKeyData, MurenaPublicKey, PublicKeyLength) == 0) {
+ *OutIsTrusted = true;
} else {
*OutIsTrusted = false;
SetMem (UserData->PublicKey,