Merge pull request #3055 from aaronjamt/patch-cmac-padding

Fix CMAC padding for ARM
This commit is contained in:
Iceman
2025-12-21 11:00:07 +01:00
committed by GitHub
2 changed files with 2 additions and 6 deletions
+1 -3
View File
@@ -63,11 +63,9 @@ static void generate_subkeys(mbedtls_des3_context *ctx, uint8_t *K1, uint8_t *K2
// Pad the last block (adds 0x80 followed by zeros)
static void padding(const uint8_t *lastb, uint8_t *pad, size_t len) {
memset(pad, 0x00, len);
memcpy(pad, lastb, len);
pad[len] = 0x80;
for (size_t i = len + 1; i < 16; i++) {
pad[i] = 0x00;
}
}
// CMAC implementation
+1 -3
View File
@@ -89,11 +89,9 @@ static void generate_subkeys(mbedtls_aes_context *ctx, uint8_t *K1, uint8_t *K2)
// Pad the last block (adds 0x80 followed by zeros)
static void padding(const uint8_t *lastb, uint8_t *pad, size_t len) {
memset(pad, 0x00, len);
memcpy(pad, lastb, len);
pad[len] = 0x80;
for (size_t i = len + 1; i < 16; i++) {
pad[i] = 0x00;
}
}
// CMAC implementation