Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-01-06 18:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tpm2: Refactor code that gets current IV

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2023-02-11 11:15:41 -05:00 committed by Stefan Berger
parent 520a2fa27d
commit f531ad6927
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tpm2/crypto/openssl/CryptSym.c
View File

@ -621,7 +621,8 @@ CryptSymmetricEncrypt(
ERROR_RETURN(TPM_RC_FAILURE);
ivInOut->t.size = ivLen;
memcpy(ivInOut->t.buffer, EVP_CIPHER_CTX_iv(ctx), ivInOut->t.size);
if (DoEVPGetIV(ctx, ivInOut->t.buffer, ivInOut->t.size))
ERROR_RETURN(TPM_RC_FAILURE);
}
Exit:
if (retVal == TPM_RC_SUCCESS && pOut != dOut)
@ -743,7 +744,8 @@ CryptSymmetricDecrypt(
ERROR_RETURN(TPM_RC_FAILURE);
ivInOut->t.size = ivLen;
memcpy(ivInOut->t.buffer, EVP_CIPHER_CTX_iv(ctx), ivInOut->t.size);
if (DoEVPGetIV(ctx, ivInOut->t.buffer, ivInOut->t.size))
ERROR_RETURN(TPM_RC_FAILURE);
}
Exit:

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

@ -286,6 +286,22 @@ evpfunc GetEVPCipher(TPM_ALG_ID algorithm, // IN
return evpfn;
}
TPM_RC DoEVPGetIV(
EVP_CIPHER_CTX *ctx, // IN: required context
unsigned char *iv, // IN: pointer to buffer for IV
size_t iv_len // IN: size of the buffer
)
{
const unsigned char *c_iv;
c_iv = EVP_CIPHER_CTX_iv(ctx);
if (!c_iv)
return TPM_RC_FAILURE;
memcpy(iv, c_iv, iv_len);
return 0;
}
#endif // USE_OPENSSL_FUNCTIONS_SYMMETRIC
#if USE_OPENSSL_FUNCTIONS_EC

7
src/tpm2/crypto/openssl/Helpers_fp.h
View File

@ -80,6 +80,13 @@ evpfunc GetEVPCipher(TPM_ALG_ID algorithm, // IN
BYTE *keyToUse, // OUT same as key or stretched key
UINT16 *keyToUseLen // IN/OUT
);
TPM_RC DoEVPGetIV(
EVP_CIPHER_CTX *ctx, // IN: required context
unsigned char *iv, // IN: pointer to buffer for IV
size_t iv_len // IN: size of the buffer
);
#endif
#if USE_OPENSSL_FUNCTIONS_EC