Small refactor for rp2 and rp3 + add new sign keys

This commit is contained in:
QCDLZCLW3K
2022-05-12 05:18:07 +09:00
parent ce75e149f7
commit 926bbf2e10
16 changed files with 179 additions and 175 deletions
+4 -47
View File
@@ -1,3 +1,4 @@
#include "security/rp2.h"
#include "security/rp3.h"
#include "security/rp-util.h"
#include "security/util.h"
@@ -6,49 +7,6 @@
#include "util/crypto.h"
#include "util/log.h"
static uint8_t security_rp3_signature_scramble_table[] = {0x0C,
0x02,
0x0F,
0x01,
0x07,
0x09,
0x04,
0x0A,
0x00,
0x0E,
0x03,
0x0D,
0x0B,
0x05,
0x08,
0x06};
static void security_rp3_create_signature(
const uint8_t *plug_id, const uint8_t *sign_key_packed, uint8_t *out)
{
uint8_t data[14];
uint8_t md5[16];
uint8_t buffer[18];
memcpy(data, plug_id, 8);
memcpy(data + 8, sign_key_packed, 6);
crypto_init();
md5_compute(data, 14, md5, sizeof(md5));
crypto_fini();
for (int i = 0; i < 16; i++) {
buffer[i] = md5[security_rp3_signature_scramble_table[i]];
}
buffer[16] = 0xDE;
buffer[17] = 0xAD;
for (int i = 0; i < 6; i++) {
out[i] = buffer[i + 12] ^ buffer[i + 6] ^ buffer[i];
}
}
void security_rp3_generate_signed_eeprom_data(
enum security_rp_util_rp_type type,
const struct security_rp_sign_key *sign_key,
@@ -57,7 +15,6 @@ void security_rp3_generate_signed_eeprom_data(
struct security_rp3_eeprom *out)
{
uint8_t sign_key_tmp[8];
uint8_t sign_key_packed[6];
uint8_t plug_id_reversed[8];
log_assert(sign_key);
@@ -73,7 +30,7 @@ void security_rp3_generate_signed_eeprom_data(
}
}
security_util_8_to_6_encode(sign_key_tmp, sign_key_packed);
security_util_8_to_6_encode(sign_key_tmp, sign_key_tmp);
for (int i = 0; i < sizeof(plug_id_reversed); i++) {
plug_id_reversed[i] = plug_id->id[7 - i];
@@ -83,7 +40,7 @@ void security_rp3_generate_signed_eeprom_data(
(const uint8_t *) plug_mcode, out->packed_payload);
memset(out->zeros, 0, sizeof(out->zeros));
security_rp3_create_signature(
plug_id_reversed, sign_key_packed, out->signature);
security_rp2_create_signature(
plug_id_reversed, sign_key_tmp, out->signature);
out->crc = crc8((uint8_t *) out, sizeof(*out) - 1, 0);
}