sysapi: Update SetCmdAuths and GetRspAuths to new parameter type

Since the last iteration of the specification there is just a struct
with an array directly embedded.
This is a large change, but removes a lot of complexity.

Signed-off-by: Andreas Fuchs <andreas.fuchs@sit.fraunhofer.de>
Signed-off-by: Juergen Repp <juergen.repp@sit.fraunhofer.de>

2 files changed, 218 insertions, 221 deletions

diff --git a/include/sapi/sys_api_part3.h b/include/sapi/sys_api_part3.h
index 17f86701..96dac17a 100644
--- a/include/sapi/sys_api_part3.h
+++ b/include/sapi/sys_api_part3.h
@@ -430,9 +430,9 @@ TSS2_RC Tss2_Sys_Shutdown_Prepare(
 
 TSS2_RC Tss2_Sys_Shutdown(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2_SU	shutdownType,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SelfTest_Prepare(
@@ -442,9 +442,9 @@ TSS2_RC Tss2_Sys_SelfTest_Prepare(
 
 TSS2_RC Tss2_Sys_SelfTest(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_YES_NO	fullTest,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_IncrementalSelfTest_Prepare(
@@ -459,10 +459,10 @@ TSS2_RC Tss2_Sys_IncrementalSelfTest_Complete(
 
 TSS2_RC Tss2_Sys_IncrementalSelfTest(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPML_ALG	*toTest,
     TPML_ALG	*toDoList,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetTestResult_Prepare(
@@ -477,10 +477,10 @@ TSS2_RC Tss2_Sys_GetTestResult_Complete(
 
 TSS2_RC Tss2_Sys_GetTestResult(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_MAX_BUFFER	*outData,
     TPM2_RC	*testResult,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_StartAuthSession_Prepare(
@@ -504,7 +504,7 @@ TSS2_RC Tss2_Sys_StartAuthSession(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	tpmKey,
     TPMI_DH_ENTITY	bind,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_NONCE	*nonceCaller,
     const TPM2B_ENCRYPTED_SECRET	*encryptedSalt,
     TPM2_SE	sessionType,
@@ -512,7 +512,7 @@ TSS2_RC Tss2_Sys_StartAuthSession(
     TPMI_ALG_HASH	authHash,
     TPMI_SH_AUTH_SESSION	*sessionHandle,
     TPM2B_NONCE	*nonceTPM,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyRestart_Prepare(
@@ -523,8 +523,8 @@ TSS2_RC Tss2_Sys_PolicyRestart_Prepare(
 TSS2_RC Tss2_Sys_PolicyRestart(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	sessionHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Create_Prepare(
@@ -548,7 +548,7 @@ TSS2_RC Tss2_Sys_Create_Complete(
 TSS2_RC Tss2_Sys_Create(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	parentHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_SENSITIVE_CREATE	*inSensitive,
     const TPM2B_PUBLIC	*inPublic,
     const TPM2B_DATA	*outsideInfo,
@@ -558,7 +558,7 @@ TSS2_RC Tss2_Sys_Create(
     TPM2B_CREATION_DATA	*creationData,
     TPM2B_DIGEST	*creationHash,
     TPMT_TK_CREATION	*creationTicket,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Load_Prepare(
@@ -577,12 +577,12 @@ TSS2_RC Tss2_Sys_Load_Complete(
 TSS2_RC Tss2_Sys_Load(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	parentHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_PRIVATE	*inPrivate,
     const TPM2B_PUBLIC	*inPublic,
     TPM2_HANDLE	*objectHandle,
     TPM2B_NAME	*name,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_LoadExternal_Prepare(
@@ -600,13 +600,13 @@ TSS2_RC Tss2_Sys_LoadExternal_Complete(
 
 TSS2_RC Tss2_Sys_LoadExternal(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_SENSITIVE	*inPrivate,
     const TPM2B_PUBLIC	*inPublic,
     TPMI_RH_HIERARCHY	hierarchy,
     TPM2_HANDLE	*objectHandle,
     TPM2B_NAME	*name,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ReadPublic_Prepare(
@@ -624,11 +624,11 @@ TSS2_RC Tss2_Sys_ReadPublic_Complete(
 TSS2_RC Tss2_Sys_ReadPublic(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	objectHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_PUBLIC	*outPublic,
     TPM2B_NAME	*name,
     TPM2B_NAME	*qualifiedName,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ActivateCredential_Prepare(
@@ -648,11 +648,11 @@ TSS2_RC Tss2_Sys_ActivateCredential(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	activateHandle,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_ID_OBJECT	*credentialBlob,
     const TPM2B_ENCRYPTED_SECRET	*secret,
     TPM2B_DIGEST	*certInfo,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_MakeCredential_Prepare(
@@ -671,12 +671,12 @@ TSS2_RC Tss2_Sys_MakeCredential_Complete(
 TSS2_RC Tss2_Sys_MakeCredential(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	handle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*credential,
     const TPM2B_NAME	*objectName,
     TPM2B_ID_OBJECT	*credentialBlob,
     TPM2B_ENCRYPTED_SECRET	*secret,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Unseal_Prepare(
@@ -692,9 +692,9 @@ TSS2_RC Tss2_Sys_Unseal_Complete(
 TSS2_RC Tss2_Sys_Unseal(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	itemHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_SENSITIVE_DATA	*outData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ObjectChangeAuth_Prepare(
@@ -713,10 +713,10 @@ TSS2_RC Tss2_Sys_ObjectChangeAuth(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	objectHandle,
     TPMI_DH_OBJECT	parentHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*newAuth,
     TPM2B_PRIVATE	*outPrivate,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Duplicate_Prepare(
@@ -738,13 +738,13 @@ TSS2_RC Tss2_Sys_Duplicate(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	objectHandle,
     TPMI_DH_OBJECT	newParentHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*encryptionKeyIn,
     const TPMT_SYM_DEF_OBJECT	*symmetricAlg,
     TPM2B_DATA	*encryptionKeyOut,
     TPM2B_PRIVATE	*duplicate,
     TPM2B_ENCRYPTED_SECRET	*outSymSeed,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Rewrap_Prepare(
@@ -766,13 +766,13 @@ TSS2_RC Tss2_Sys_Rewrap(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	oldParent,
     TPMI_DH_OBJECT	newParent,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_PRIVATE	*inDuplicate,
     const TPM2B_NAME	*name,
     const TPM2B_ENCRYPTED_SECRET	*inSymSeed,
     TPM2B_PRIVATE	*outDuplicate,
     TPM2B_ENCRYPTED_SECRET	*outSymSeed,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Import_Prepare(
@@ -793,14 +793,14 @@ TSS2_RC Tss2_Sys_Import_Complete(
 TSS2_RC Tss2_Sys_Import(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	parentHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*encryptionKey,
     const TPM2B_PUBLIC	*objectPublic,
     const TPM2B_PRIVATE	*duplicate,
     const TPM2B_ENCRYPTED_SECRET	*inSymSeed,
     const TPMT_SYM_DEF_OBJECT	*symmetricAlg,
     TPM2B_PRIVATE	*outPrivate,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_RSA_Encrypt_Prepare(
@@ -819,12 +819,12 @@ TSS2_RC Tss2_Sys_RSA_Encrypt_Complete(
 TSS2_RC Tss2_Sys_RSA_Encrypt(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_PUBLIC_KEY_RSA	*message,
     const TPMT_RSA_DECRYPT	*inScheme,
     const TPM2B_DATA	*label,
     TPM2B_PUBLIC_KEY_RSA	*outData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_RSA_Decrypt_Prepare(
@@ -843,12 +843,12 @@ TSS2_RC Tss2_Sys_RSA_Decrypt_Complete(
 TSS2_RC Tss2_Sys_RSA_Decrypt(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_PUBLIC_KEY_RSA	*cipherText,
     const TPMT_RSA_DECRYPT	*inScheme,
     const TPM2B_DATA	*label,
     TPM2B_PUBLIC_KEY_RSA	*message,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ECDH_KeyGen_Prepare(
@@ -865,10 +865,10 @@ TSS2_RC Tss2_Sys_ECDH_KeyGen_Complete(
 TSS2_RC Tss2_Sys_ECDH_KeyGen(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_ECC_POINT	*zPoint,
     TPM2B_ECC_POINT	*pubPoint,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ECDH_ZGen_Prepare(
@@ -885,10 +885,10 @@ TSS2_RC Tss2_Sys_ECDH_ZGen_Complete(
 TSS2_RC Tss2_Sys_ECDH_ZGen(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_ECC_POINT	*inPoint,
     TPM2B_ECC_POINT	*outPoint,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ECC_Parameters_Prepare(
@@ -903,10 +903,10 @@ TSS2_RC Tss2_Sys_ECC_Parameters_Complete(
 
 TSS2_RC Tss2_Sys_ECC_Parameters(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_ECC_CURVE	curveID,
     TPMS_ALGORITHM_DETAIL_ECC	*parameters,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ZGen_2Phase_Prepare(
@@ -927,14 +927,14 @@ TSS2_RC Tss2_Sys_ZGen_2Phase_Complete(
 TSS2_RC Tss2_Sys_ZGen_2Phase(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyA,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_ECC_POINT	*inQsB,
     const TPM2B_ECC_POINT	*inQeB,
     TPMI_ECC_KEY_EXCHANGE	inScheme,
     UINT16	counter,
     TPM2B_ECC_POINT	*outZ1,
     TPM2B_ECC_POINT	*outZ2,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_EncryptDecrypt_Prepare(
@@ -955,14 +955,14 @@ TSS2_RC Tss2_Sys_EncryptDecrypt_Complete(
 TSS2_RC Tss2_Sys_EncryptDecrypt(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_YES_NO	decrypt,
     TPMI_ALG_SYM_MODE	mode,
     const TPM2B_IV	*ivIn,
     const TPM2B_MAX_BUFFER	*inData,
     TPM2B_MAX_BUFFER	*outData,
     TPM2B_IV	*ivOut,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_EncryptDecrypt2_Prepare(
@@ -983,14 +983,14 @@ TSS2_RC Tss2_Sys_EncryptDecrypt2_Complete(
 TSS2_RC Tss2_Sys_EncryptDecrypt2(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*inData,
     TPMI_YES_NO	decrypt,
     TPMI_ALG_SYM_MODE	mode,
     const TPM2B_IV	*ivIn,
     TPM2B_MAX_BUFFER	*outData,
     TPM2B_IV	*ivOut,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Hash_Prepare(
@@ -1008,13 +1008,13 @@ TSS2_RC Tss2_Sys_Hash_Complete(
 
 TSS2_RC Tss2_Sys_Hash(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*data,
     TPMI_ALG_HASH	hashAlg,
     TPMI_RH_HIERARCHY	hierarchy,
     TPM2B_DIGEST	*outHash,
     TPMT_TK_HASHCHECK	*validation,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_HMAC_Prepare(
@@ -1032,11 +1032,11 @@ TSS2_RC Tss2_Sys_HMAC_Complete(
 TSS2_RC Tss2_Sys_HMAC(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	handle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*buffer,
     TPMI_ALG_HASH	hashAlg,
     TPM2B_DIGEST	*outHMAC,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetRandom_Prepare(
@@ -1051,10 +1051,10 @@ TSS2_RC Tss2_Sys_GetRandom_Complete(
 
 TSS2_RC Tss2_Sys_GetRandom(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT16	bytesRequested,
     TPM2B_DIGEST	*randomBytes,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_StirRandom_Prepare(
@@ -1064,9 +1064,9 @@ TSS2_RC Tss2_Sys_StirRandom_Prepare(
 
 TSS2_RC Tss2_Sys_StirRandom(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_SENSITIVE_DATA	*inData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_HMAC_Start_Prepare(
@@ -1084,11 +1084,11 @@ TSS2_RC Tss2_Sys_HMAC_Start_Complete(
 TSS2_RC Tss2_Sys_HMAC_Start(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	handle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*auth,
     TPMI_ALG_HASH	hashAlg,
     TPMI_DH_OBJECT	*sequenceHandle,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_HashSequenceStart_Prepare(
@@ -1104,11 +1104,11 @@ TSS2_RC Tss2_Sys_HashSequenceStart_Complete(
 
 TSS2_RC Tss2_Sys_HashSequenceStart(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*auth,
     TPMI_ALG_HASH	hashAlg,
     TPMI_DH_OBJECT	*sequenceHandle,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SequenceUpdate_Prepare(
@@ -1120,9 +1120,9 @@ TSS2_RC Tss2_Sys_SequenceUpdate_Prepare(
 TSS2_RC Tss2_Sys_SequenceUpdate(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	sequenceHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*buffer,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SequenceComplete_Prepare(
@@ -1141,12 +1141,12 @@ TSS2_RC Tss2_Sys_SequenceComplete_Complete(
 TSS2_RC Tss2_Sys_SequenceComplete(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	sequenceHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*buffer,
     TPMI_RH_HIERARCHY	hierarchy,
     TPM2B_DIGEST	*result,
     TPMT_TK_HASHCHECK	*validation,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_EventSequenceComplete_Prepare(
@@ -1165,10 +1165,10 @@ TSS2_RC Tss2_Sys_EventSequenceComplete(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_PCR	pcrHandle,
     TPMI_DH_OBJECT	sequenceHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_BUFFER	*buffer,
     TPML_DIGEST_VALUES	*results,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Certify_Prepare(
@@ -1189,12 +1189,12 @@ TSS2_RC Tss2_Sys_Certify(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	objectHandle,
     TPMI_DH_OBJECT	signHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     TPM2B_ATTEST	*certifyInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_CertifyCreation_Prepare(
@@ -1217,14 +1217,14 @@ TSS2_RC Tss2_Sys_CertifyCreation(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	signHandle,
     TPMI_DH_OBJECT	objectHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPM2B_DIGEST	*creationHash,
     const TPMT_SIG_SCHEME	*inScheme,
     const TPMT_TK_CREATION	*creationTicket,
     TPM2B_ATTEST	*certifyInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Quote_Prepare(
@@ -1244,13 +1244,13 @@ TSS2_RC Tss2_Sys_Quote_Complete(
 TSS2_RC Tss2_Sys_Quote(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	signHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     const TPML_PCR_SELECTION	*PCRselect,
     TPM2B_ATTEST	*quoted,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetSessionAuditDigest_Prepare(
@@ -1273,12 +1273,12 @@ TSS2_RC Tss2_Sys_GetSessionAuditDigest(
     TPMI_RH_ENDORSEMENT	privacyAdminHandle,
     TPMI_DH_OBJECT	signHandle,
     TPMI_SH_HMAC	sessionHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     TPM2B_ATTEST	*auditInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetCommandAuditDigest_Prepare(
@@ -1299,12 +1299,12 @@ TSS2_RC Tss2_Sys_GetCommandAuditDigest(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_ENDORSEMENT	privacyHandle,
     TPMI_DH_OBJECT	signHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     TPM2B_ATTEST	*auditInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetTime_Prepare(
@@ -1325,12 +1325,12 @@ TSS2_RC Tss2_Sys_GetTime(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_ENDORSEMENT	privacyAdminHandle,
     TPMI_DH_OBJECT	signHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     TPM2B_ATTEST	*timeInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Commit_Prepare(
@@ -1352,7 +1352,7 @@ TSS2_RC Tss2_Sys_Commit_Complete(
 TSS2_RC Tss2_Sys_Commit(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	signHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_ECC_POINT	*P1,
     const TPM2B_SENSITIVE_DATA	*s2,
     const TPM2B_ECC_PARAMETER	*y2,
@@ -1360,7 +1360,7 @@ TSS2_RC Tss2_Sys_Commit(
     TPM2B_ECC_POINT	*L,
     TPM2B_ECC_POINT	*E,
     UINT16	*counter,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_EC_Ephemeral_Prepare(
@@ -1376,11 +1376,11 @@ TSS2_RC Tss2_Sys_EC_Ephemeral_Complete(
 
 TSS2_RC Tss2_Sys_EC_Ephemeral(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_ECC_CURVE	curveID,
     TPM2B_ECC_POINT	*Q,
     UINT16	*counter,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_VerifySignature_Prepare(
@@ -1398,11 +1398,11 @@ TSS2_RC Tss2_Sys_VerifySignature_Complete(
 TSS2_RC Tss2_Sys_VerifySignature(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*digest,
     const TPMT_SIGNATURE	*signature,
     TPMT_TK_VERIFIED	*validation,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Sign_Prepare(
@@ -1421,12 +1421,12 @@ TSS2_RC Tss2_Sys_Sign_Complete(
 TSS2_RC Tss2_Sys_Sign(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*digest,
     const TPMT_SIG_SCHEME	*inScheme,
     const TPMT_TK_HASHCHECK	*validation,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Prepare(
@@ -1440,11 +1440,11 @@ TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus_Prepare(
 TSS2_RC Tss2_Sys_SetCommandCodeAuditStatus(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	auth,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_ALG_HASH	auditAlg,
     const TPML_CC	*setList,
     const TPML_CC	*clearList,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_Extend_Prepare(
@@ -1456,9 +1456,9 @@ TSS2_RC Tss2_Sys_PCR_Extend_Prepare(
 TSS2_RC Tss2_Sys_PCR_Extend(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_PCR	pcrHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPML_DIGEST_VALUES	*digests,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_Event_Prepare(
@@ -1475,10 +1475,10 @@ TSS2_RC Tss2_Sys_PCR_Event_Complete(
 TSS2_RC Tss2_Sys_PCR_Event(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_PCR	pcrHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_EVENT	*eventData,
     TPML_DIGEST_VALUES	*digests,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_Read_Prepare(
@@ -1495,12 +1495,12 @@ TSS2_RC Tss2_Sys_PCR_Read_Complete(
 
 TSS2_RC Tss2_Sys_PCR_Read(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPML_PCR_SELECTION	*pcrSelectionIn,
     UINT32	*pcrUpdateCounter,
     TPML_PCR_SELECTION	*pcrSelectionOut,
     TPML_DIGEST	*pcrValues,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_Allocate_Prepare(
@@ -1520,13 +1520,13 @@ TSS2_RC Tss2_Sys_PCR_Allocate_Complete(
 TSS2_RC Tss2_Sys_PCR_Allocate(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPML_PCR_SELECTION	*pcrAllocation,
     TPMI_YES_NO	*allocationSuccess,
     UINT32	*maxPCR,
     UINT32	*sizeNeeded,
     UINT32	*sizeAvailable,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Prepare(
@@ -1540,11 +1540,11 @@ TSS2_RC Tss2_Sys_PCR_SetAuthPolicy_Prepare(
 TSS2_RC Tss2_Sys_PCR_SetAuthPolicy(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*authPolicy,
     TPMI_ALG_HASH	hashAlg,
     TPMI_DH_PCR	pcrNum,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_SetAuthValue_Prepare(
@@ -1556,9 +1556,9 @@ TSS2_RC Tss2_Sys_PCR_SetAuthValue_Prepare(
 TSS2_RC Tss2_Sys_PCR_SetAuthValue(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_PCR	pcrHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*auth,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PCR_Reset_Prepare(
@@ -1569,8 +1569,8 @@ TSS2_RC Tss2_Sys_PCR_Reset_Prepare(
 TSS2_RC Tss2_Sys_PCR_Reset(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_PCR	pcrHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicySigned_Prepare(
@@ -1594,7 +1594,7 @@ TSS2_RC Tss2_Sys_PolicySigned(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_OBJECT	authObject,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_NONCE	*nonceTPM,
     const TPM2B_DIGEST	*cpHashA,
     const TPM2B_NONCE	*policyRef,
@@ -1602,7 +1602,7 @@ TSS2_RC Tss2_Sys_PolicySigned(
     const TPMT_SIGNATURE	*auth,
     TPM2B_TIMEOUT	*timeout,
     TPMT_TK_AUTH	*policyTicket,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicySecret_Prepare(
@@ -1625,14 +1625,14 @@ TSS2_RC Tss2_Sys_PolicySecret(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_DH_ENTITY	authHandle,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_NONCE	*nonceTPM,
     const TPM2B_DIGEST	*cpHashA,
     const TPM2B_NONCE	*policyRef,
     INT32	expiration,
     TPM2B_TIMEOUT	*timeout,
     TPMT_TK_AUTH	*policyTicket,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyTicket_Prepare(
@@ -1648,13 +1648,13 @@ TSS2_RC Tss2_Sys_PolicyTicket_Prepare(
 TSS2_RC Tss2_Sys_PolicyTicket(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_TIMEOUT	*timeout,
     const TPM2B_DIGEST	*cpHashA,
     const TPM2B_NONCE	*policyRef,
     const TPM2B_NAME	*authName,
     const TPMT_TK_AUTH	*ticket,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyOR_Prepare(
@@ -1666,9 +1666,9 @@ TSS2_RC Tss2_Sys_PolicyOR_Prepare(
 TSS2_RC Tss2_Sys_PolicyOR(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPML_DIGEST	*pHashList,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyPCR_Prepare(
@@ -1681,10 +1681,10 @@ TSS2_RC Tss2_Sys_PolicyPCR_Prepare(
 TSS2_RC Tss2_Sys_PolicyPCR(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*pcrDigest,
     const TPML_PCR_SELECTION	*pcrs,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyLocality_Prepare(
@@ -1696,9 +1696,9 @@ TSS2_RC Tss2_Sys_PolicyLocality_Prepare(
 TSS2_RC Tss2_Sys_PolicyLocality(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMA_LOCALITY	locality,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyNV_Prepare(
@@ -1716,11 +1716,11 @@ TSS2_RC Tss2_Sys_PolicyNV(
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_OPERAND	*operandB,
     UINT16	offset,
     TPM2_EO	operation,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyCounterTimer_Prepare(
@@ -1734,11 +1734,11 @@ TSS2_RC Tss2_Sys_PolicyCounterTimer_Prepare(
 TSS2_RC Tss2_Sys_PolicyCounterTimer(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_OPERAND	*operandB,
     UINT16	offset,
     TPM2_EO	operation,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyCommandCode_Prepare(
@@ -1750,9 +1750,9 @@ TSS2_RC Tss2_Sys_PolicyCommandCode_Prepare(
 TSS2_RC Tss2_Sys_PolicyCommandCode(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2_CC	code,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Prepare(
@@ -1763,8 +1763,8 @@ TSS2_RC Tss2_Sys_PolicyPhysicalPresence_Prepare(
 TSS2_RC Tss2_Sys_PolicyPhysicalPresence(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyCpHash_Prepare(
@@ -1776,9 +1776,9 @@ TSS2_RC Tss2_Sys_PolicyCpHash_Prepare(
 TSS2_RC Tss2_Sys_PolicyCpHash(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*cpHashA,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyNameHash_Prepare(
@@ -1790,9 +1790,9 @@ TSS2_RC Tss2_Sys_PolicyNameHash_Prepare(
 TSS2_RC Tss2_Sys_PolicyNameHash(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*nameHash,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Prepare(
@@ -1806,11 +1806,11 @@ TSS2_RC Tss2_Sys_PolicyDuplicationSelect_Prepare(
 TSS2_RC Tss2_Sys_PolicyDuplicationSelect(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_NAME	*objectName,
     const TPM2B_NAME	*newParentName,
     TPMI_YES_NO	includeObject,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyAuthorize_Prepare(
@@ -1825,12 +1825,12 @@ TSS2_RC Tss2_Sys_PolicyAuthorize_Prepare(
 TSS2_RC Tss2_Sys_PolicyAuthorize(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*approvedPolicy,
     const TPM2B_NONCE	*policyRef,
     const TPM2B_NAME	*keySign,
     const TPMT_TK_VERIFIED	*checkTicket,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyAuthValue_Prepare(
@@ -1841,8 +1841,8 @@ TSS2_RC Tss2_Sys_PolicyAuthValue_Prepare(
 TSS2_RC Tss2_Sys_PolicyAuthValue(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyPassword_Prepare(
@@ -1853,8 +1853,8 @@ TSS2_RC Tss2_Sys_PolicyPassword_Prepare(
 TSS2_RC Tss2_Sys_PolicyPassword(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyGetDigest_Prepare(
@@ -1870,9 +1870,9 @@ TSS2_RC Tss2_Sys_PolicyGetDigest_Complete(
 TSS2_RC Tss2_Sys_PolicyGetDigest(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_DIGEST	*policyDigest,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PolicyNvWritten_Prepare(
@@ -1884,9 +1884,9 @@ TSS2_RC Tss2_Sys_PolicyNvWritten_Prepare(
 TSS2_RC Tss2_Sys_PolicyNvWritten(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_SH_POLICY	policySession,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_YES_NO	writtenSet,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_CreatePrimary_Prepare(
@@ -1911,7 +1911,7 @@ TSS2_RC Tss2_Sys_CreatePrimary_Complete(
 TSS2_RC Tss2_Sys_CreatePrimary(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_HIERARCHY	primaryHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_SENSITIVE_CREATE	*inSensitive,
     const TPM2B_PUBLIC	*inPublic,
     const TPM2B_DATA	*outsideInfo,
@@ -1922,7 +1922,7 @@ TSS2_RC Tss2_Sys_CreatePrimary(
     TPM2B_DIGEST	*creationHash,
     TPMT_TK_CREATION	*creationTicket,
     TPM2B_NAME	*name,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_HierarchyControl_Prepare(
@@ -1935,10 +1935,10 @@ TSS2_RC Tss2_Sys_HierarchyControl_Prepare(
 TSS2_RC Tss2_Sys_HierarchyControl(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_HIERARCHY	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_RH_ENABLES	enable,
     TPMI_YES_NO	state,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SetPrimaryPolicy_Prepare(
@@ -1951,10 +1951,10 @@ TSS2_RC Tss2_Sys_SetPrimaryPolicy_Prepare(
 TSS2_RC Tss2_Sys_SetPrimaryPolicy(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_HIERARCHY_AUTH	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DIGEST	*authPolicy,
     TPMI_ALG_HASH	hashAlg,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ChangePPS_Prepare(
@@ -1965,8 +1965,8 @@ TSS2_RC Tss2_Sys_ChangePPS_Prepare(
 TSS2_RC Tss2_Sys_ChangePPS(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ChangeEPS_Prepare(
@@ -1977,8 +1977,8 @@ TSS2_RC Tss2_Sys_ChangeEPS_Prepare(
 TSS2_RC Tss2_Sys_ChangeEPS(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Clear_Prepare(
@@ -1989,8 +1989,8 @@ TSS2_RC Tss2_Sys_Clear_Prepare(
 TSS2_RC Tss2_Sys_Clear(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_CLEAR	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ClearControl_Prepare(
@@ -2002,9 +2002,9 @@ TSS2_RC Tss2_Sys_ClearControl_Prepare(
 TSS2_RC Tss2_Sys_ClearControl(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_CLEAR	auth,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_YES_NO	disable,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_HierarchyChangeAuth_Prepare(
@@ -2016,9 +2016,9 @@ TSS2_RC Tss2_Sys_HierarchyChangeAuth_Prepare(
 TSS2_RC Tss2_Sys_HierarchyChangeAuth(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_HIERARCHY_AUTH	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*newAuth,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Prepare(
@@ -2029,8 +2029,8 @@ TSS2_RC Tss2_Sys_DictionaryAttackLockReset_Prepare(
 TSS2_RC Tss2_Sys_DictionaryAttackLockReset(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_LOCKOUT	lockHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_DictionaryAttackParameters_Prepare(
@@ -2044,11 +2044,11 @@ TSS2_RC Tss2_Sys_DictionaryAttackParameters_Prepare(
 TSS2_RC Tss2_Sys_DictionaryAttackParameters(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_LOCKOUT	lockHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT32	newMaxTries,
     UINT32	newRecoveryTime,
     UINT32	lockoutRecovery,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_PP_Commands_Prepare(
@@ -2061,10 +2061,10 @@ TSS2_RC Tss2_Sys_PP_Commands_Prepare(
 TSS2_RC Tss2_Sys_PP_Commands(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	auth,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPML_CC	*setList,
     const TPML_CC	*clearList,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_SetAlgorithmSet_Prepare(
@@ -2076,9 +2076,9 @@ TSS2_RC Tss2_Sys_SetAlgorithmSet_Prepare(
 TSS2_RC Tss2_Sys_SetAlgorithmSet(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT32	algorithmSet,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_FieldUpgradeStart_Prepare(
@@ -2093,10 +2093,10 @@ TSS2_RC Tss2_Sys_FieldUpgradeStart(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PLATFORM	authorization,
     TPMI_DH_OBJECT	keyHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_DIGEST	*fuDigest,
     TPMT_SIGNATURE	*manifestSignature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_FieldUpgradeData_Prepare(
@@ -2112,11 +2112,11 @@ TSS2_RC Tss2_Sys_FieldUpgradeData_Complete(
 
 TSS2_RC Tss2_Sys_FieldUpgradeData(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_MAX_BUFFER	*fuData,
     TPMT_HA	*nextDigest,
     TPMT_HA	*firstDigest,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_FirmwareRead_Prepare(
@@ -2131,10 +2131,10 @@ TSS2_RC Tss2_Sys_FirmwareRead_Complete(
 
 TSS2_RC Tss2_Sys_FirmwareRead(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT32	sequenceNumber,
     TPM2B_MAX_BUFFER	*fuData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ContextSave_Prepare(
@@ -2190,9 +2190,9 @@ TSS2_RC Tss2_Sys_EvictControl(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	auth,
     TPMI_DH_OBJECT	objectHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPMI_DH_PERSISTENT	persistentHandle,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ReadClock_Prepare(
@@ -2218,9 +2218,9 @@ TSS2_RC Tss2_Sys_ClockSet_Prepare(
 TSS2_RC Tss2_Sys_ClockSet(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	auth,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT64	newTime,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_ClockRateAdjust_Prepare(
@@ -2232,9 +2232,9 @@ TSS2_RC Tss2_Sys_ClockRateAdjust_Prepare(
 TSS2_RC Tss2_Sys_ClockRateAdjust(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	auth,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2_CLOCK_ADJUST	rateAdjust,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetCapability_Prepare(
@@ -2252,13 +2252,13 @@ TSS2_RC Tss2_Sys_GetCapability_Complete(
 
 TSS2_RC Tss2_Sys_GetCapability(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2_CAP	capability,
     UINT32	property,
     UINT32	propertyCount,
     TPMI_YES_NO	*moreData,
     TPMS_CAPABILITY_DATA	*capabilityData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_TestParms_Prepare(
@@ -2268,9 +2268,9 @@ TSS2_RC Tss2_Sys_TestParms_Prepare(
 
 TSS2_RC Tss2_Sys_TestParms(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPMT_PUBLIC_PARMS	*parameters,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_DefineSpace_Prepare(
@@ -2283,10 +2283,10 @@ TSS2_RC Tss2_Sys_NV_DefineSpace_Prepare(
 TSS2_RC Tss2_Sys_NV_DefineSpace(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*auth,
     const TPM2B_NV_PUBLIC	*publicInfo,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_UndefineSpace_Prepare(
@@ -2299,8 +2299,8 @@ TSS2_RC Tss2_Sys_NV_UndefineSpace(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial_Prepare(
@@ -2313,8 +2313,8 @@ TSS2_RC Tss2_Sys_NV_UndefineSpaceSpecial(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_INDEX	nvIndex,
     TPMI_RH_PLATFORM	platform,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_ReadPublic_Prepare(
@@ -2331,10 +2331,10 @@ TSS2_RC Tss2_Sys_NV_ReadPublic_Complete(
 TSS2_RC Tss2_Sys_NV_ReadPublic(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     TPM2B_NV_PUBLIC	*nvPublic,
     TPM2B_NAME	*nvName,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_Write_Prepare(
@@ -2349,10 +2349,10 @@ TSS2_RC Tss2_Sys_NV_Write(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_NV_BUFFER	*data,
     UINT16	offset,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_Increment_Prepare(
@@ -2365,8 +2365,8 @@ TSS2_RC Tss2_Sys_NV_Increment(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_Extend_Prepare(
@@ -2380,9 +2380,9 @@ TSS2_RC Tss2_Sys_NV_Extend(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_MAX_NV_BUFFER	*data,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_SetBits_Prepare(
@@ -2396,9 +2396,9 @@ TSS2_RC Tss2_Sys_NV_SetBits(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT64	bits,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_WriteLock_Prepare(
@@ -2411,8 +2411,8 @@ TSS2_RC Tss2_Sys_NV_WriteLock(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Prepare(
@@ -2423,8 +2423,8 @@ TSS2_RC Tss2_Sys_NV_GlobalWriteLock_Prepare(
 TSS2_RC Tss2_Sys_NV_GlobalWriteLock(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_PROVISION	authHandle,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_Read_Prepare(
@@ -2444,11 +2444,11 @@ TSS2_RC Tss2_Sys_NV_Read(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     UINT16	size,
     UINT16	offset,
     TPM2B_MAX_NV_BUFFER	*data,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_ReadLock_Prepare(
@@ -2461,8 +2461,8 @@ TSS2_RC Tss2_Sys_NV_ReadLock(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_ChangeAuth_Prepare(
@@ -2474,9 +2474,9 @@ TSS2_RC Tss2_Sys_NV_ChangeAuth_Prepare(
 TSS2_RC Tss2_Sys_NV_ChangeAuth(
     TSS2_SYS_CONTEXT *sysContext,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_AUTH	*newAuth,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_NV_Certify_Prepare(
@@ -2501,14 +2501,14 @@ TSS2_RC Tss2_Sys_NV_Certify(
     TPMI_DH_OBJECT	signHandle,
     TPMI_RH_NV_AUTH	authHandle,
     TPMI_RH_NV_INDEX	nvIndex,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*qualifyingData,
     const TPMT_SIG_SCHEME	*inScheme,
     UINT16	size,
     UINT16	offset,
     TPM2B_ATTEST	*certifyInfo,
     TPMT_SIGNATURE	*signature,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_Vendor_TCG_Test_Prepare(
@@ -2523,10 +2523,10 @@ TSS2_RC Tss2_Sys_Vendor_TCG_Test_Complete(
 
 TSS2_RC Tss2_Sys_Vendor_TCG_Test(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_CMD_AUTHS const *cmdAuthsArray,
+    TSS2L_SYS_AUTH_COMMAND const *cmdAuthsArray,
     const TPM2B_DATA	*inputData,
     TPM2B_DATA	*outputData,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 #endif
diff --git a/include/sapi/tss2_sys.h b/include/sapi/tss2_sys.h
index 137c1e68..645263cc 100644
--- a/include/sapi/tss2_sys.h
+++ b/include/sapi/tss2_sys.h
@@ -55,17 +55,14 @@ typedef struct _TSS2_SYS_OPAQUE_CONTEXT_BLOB TSS2_SYS_CONTEXT;
 // Input structure for authorization area(s).
 //
 typedef struct {
-    uint8_t cmdAuthsCount;
-    TPMS_AUTH_COMMAND **cmdAuths;
-} TSS2_SYS_CMD_AUTHS;
+    uint16_t          count;
+    TPMS_AUTH_COMMAND auths[3];
+} TSS2L_SYS_AUTH_COMMAND;
 
-//
-// Output structure for authorization area(s).
-//
 typedef struct {
-    uint8_t rspAuthsCount;
-    TPMS_AUTH_RESPONSE **rspAuths;
-} TSS2_SYS_RSP_AUTHS;
+    uint16_t           count;
+    TPMS_AUTH_RESPONSE auths[3];
+} TSS2L_SYS_AUTH_RESPONSE;
 
 
 //
@@ -123,7 +120,7 @@ TSS2_RC Tss2_Sys_GetCpBuffer(
 
 TSS2_RC Tss2_Sys_SetCmdAuths(
     TSS2_SYS_CONTEXT * sysContext,
-    const TSS2_SYS_CMD_AUTHS *cmdAuthsArray
+    const TSS2L_SYS_AUTH_COMMAND *cmdAuthsArray
     );
 
 
@@ -153,7 +150,7 @@ TSS2_RC Tss2_Sys_GetCommandCode(
 
 TSS2_RC Tss2_Sys_GetRspAuths(
     TSS2_SYS_CONTEXT *sysContext,
-    TSS2_SYS_RSP_AUTHS *rspAuthsArray
+    TSS2L_SYS_AUTH_RESPONSE *rspAuthsArray
     );
 
 TSS2_RC Tss2_Sys_GetEncryptParam(