Merge pull request #4728 from miyazakh/sce_aes128_cryonly

This commit is contained in:
Chris Conlon
2022-01-17 10:28:57 -07:00
committed by GitHub
4 changed files with 82 additions and 62 deletions

View File

@@ -173,11 +173,19 @@ WOLFSSL_LOCAL int wc_sce_AesGcmEncrypt(struct Aes* aes, byte* out,
}
}
else if (info->aes256_installedkey_set == 1) {
XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes256,
else if (info->aes256_installedkey_set == 1 || info->aes128_installedkey_set == 1) {
if(aes->ctx.keySize == 32) {
XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes256,
sizeof(sce_aes_wrapped_key_t));
iv_l = iv;
ivSz_l = ivSz;
} else {
XMEMCPY(&key_client_aes, &info->sce_wrapped_key_aes128,
sizeof(sce_aes_wrapped_key_t));
}
iv_l = iv;
ivSz_l = ivSz;
} else {
WOLFSSL_MSG("AES key for SCE is not set.");
ret = -1;
}
if (ret == 0) {
@@ -346,11 +354,19 @@ WOLFSSL_LOCAL int wc_sce_AesGcmDecrypt(struct Aes* aes, byte* out,
ret = -1;
}
}
else if (info->aes256_installedkey_set == 1) {
XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes256,
sizeof(sce_aes_wrapped_key_t));
else if (info->aes256_installedkey_set == 1 || info->aes128_installedkey_set == 1) {
if(aes->ctx.keySize == 32) {
XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes256,
sizeof(sce_aes_wrapped_key_t));
} else {
XMEMCPY(&key_server_aes, &info->sce_wrapped_key_aes128,
sizeof(sce_aes_wrapped_key_t));
}
iv_l = iv;
ivSz_l = ivSz;
} else {
WOLFSSL_MSG("AES key for SCE is not set.");
ret = -1;
}
if (ret == 0) {