Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-01-08 21:13:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Replace usage of deprecated DES_random_key() (OSSL 3)

Browse Source 
Replace usage of deprecated DES_random_key() with EVP_CIPHER API calls.
These newer calls are much more time consuming than the deprecated call.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2023-02-09 13:57:06 -05:00 committed by Stefan Berger
parent 7b8572355b
commit 0de6f656b8
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/tpm2/crypto/openssl/Helpers.c
View File

@ -94,21 +94,23 @@ OpenSSLCryptGenerateKeyDes(
TPMT_SENSITIVE *sensitive // OUT: sensitive area
)
{
DES_cblock *key;
size_t offset;
size_t limit;
TPM_RC retVal = TPM_RC_SUCCESS;
EVP_CIPHER_CTX *ctx;
limit = MIN(sizeof(sensitive->sensitive.sym.t.buffer),
sensitive->sensitive.sym.t.size);
limit = TPM2_ROUNDUP(limit, sizeof(*key));
pAssert(limit < sizeof(sensitive->sensitive.sym.t.buffer));
if (!(ctx = EVP_CIPHER_CTX_new()))
return TPM_RC_MEMORY;
for (offset = 0; offset < limit; offset += sizeof(*key)) {
key = (DES_cblock *)&sensitive->sensitive.sym.t.buffer[offset];
if (DES_random_key(key) != 1)
return TPM_RC_NO_RESULT;
}
return TPM_RC_SUCCESS;
pAssert(sizeof(sensitive->sensitive.sym.t.buffer) >= 3 * sizeof(DES_cblock))
if (EVP_CipherInit_ex(ctx, EVP_des_ede3(), NULL, NULL, NULL, 0) != 1 ||
EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_RAND_KEY, 0,
sensitive->sensitive.sym.t.buffer) != 1)
ERROR_RETURN(TPM_RC_NO_RESULT);
Exit:
EVP_CIPHER_CTX_free(ctx);
return retVal;
}
evpfunc GetEVPCipher(TPM_ALG_ID algorithm, // IN