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

tpm2: Sync ObjectLoad with upstream

Browse Source 
Sync ObjectLoad with upstream. Now CryptRsaLoadPrivateExponent may be
called with the object parameter being NULL, which happens only when
it is called from TPM2_Import().

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2023-08-28 15:23:50 -04:00 committed by Stefan Berger
parent 66a503b709
commit 5620106e47
1 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/tpm2/Object.c
View File

@ -3,7 +3,6 @@
/* Manage the object store of the TPM. */
/* Written by Ken Goldman */
/* IBM Thomas J. Watson Research Center */
/* $Id: Object.c 1658 2021-01-22 23:14:01Z kgoldman $ */
/* */
/* Licenses and Notices */
/* */
@ -55,7 +54,7 @@
/* arising in any way out of use or reliance upon this specification or any */
/* information herein. */
/* */
/* (c) Copyright IBM Corp. and others, 2016 - 2021 */
/* (c) Copyright IBM Corp. and others, 2016 - 2023 */
/* */
/********************************************************************************/
@ -437,28 +436,33 @@ ObjectLoad(
if(result != TPM_RC_SUCCESS)
return result;
}
// If this is an import, we are done
if(object == NULL)
return result;
// Set the name, if one was provided
if(name != NULL)
object->name = *name;
else
object->name.t.size = 0;
// Initialize public
object->publicArea = *publicArea;
// If there is a sensitive area, load it
if(sensitive == NULL)
object->attributes.publicOnly = SET;
else
{
object->sensitive = *sensitive;
#if ALG_RSA
// If this is an RSA key that is not a parent, complete the load by
// computing the private exponent.
if(publicArea->type == ALG_RSA_VALUE)
result = CryptRsaLoadPrivateExponent(publicArea, sensitive, object);
#endif
// If this is an RSA key, then expand the private exponent.
// Note: ObjectLoad() is only called by TPM2_Import() if the parent is fixedTPM.
// For any key that does not have a fixedTPM parent, the exponent is computed
// whenever it is loaded
if((publicArea->type == TPM_ALG_RSA) && (sensitive != NULL))
{
result = CryptRsaLoadPrivateExponent(publicArea, sensitive, object); // libtpms: Added object (may be NULL)
if(result != TPM_RC_SUCCESS)
return result;
}
#endif // ALG_RSA
// See if there is an object to populate
if((result == TPM_RC_SUCCESS) && (object != NULL))
{
// Initialize public
object->publicArea = *publicArea;
// Copy sensitive if there is one
if(sensitive == NULL)
object->attributes.publicOnly = SET;
else
object->sensitive = *sensitive;
// Set the name, if one was provided
if(name != NULL)
object->name = *name;
else
object->name.t.size = 0;
}
return result;
}