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

tpm2: Fix indentations and comments in SM2 related code

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-10-13 14:11:43 +00:00 committed by Stefan Berger
parent 721f6c2e33
commit 3cf876ecf8
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tpm2/crypto/openssl/CryptCmac.c
View File

@ -143,10 +143,8 @@ CryptCmacData(
cmacState->iv.t.buffer[cmacState->bcount] ^= *buffer++;
}
}
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) // libtpms added begin
FINAL(&keySchedule); // libtpms added end
}
/* 10.2.6.3.3 CryptCmacEnd() */
@ -167,7 +165,7 @@ CryptCmacEnd(
UINT16 keySizeInBits = cState->keySizeBits;
tpmCryptKeySchedule_t keySchedule;
TpmCryptSetSymKeyCall_t encrypt;
TpmCryptSymFinal_t final; /* libtpms added */
TpmCryptSymFinal_t final; // libtpms added
TPM2B_IV subkey = {{0, {0}}};
BOOL xorVal;
UINT16 i;
@ -210,10 +208,8 @@ CryptCmacEnd(
i = (UINT16)MIN(cState->iv.t.size, outSize);
MemoryCopy(outBuffer, cState->iv.t.buffer, i);
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) // libtpms added begin
FINAL(&keySchedule); // libtpms added end
return i;
}

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

@ -175,7 +175,7 @@ CryptSymmetricEncrypt(
tpmCryptKeySchedule_t keySchedule;
INT16 blockSize;
TpmCryptSetSymKeyCall_t encrypt;
TpmCryptSymFinal_t final; /* libtpms added */
TpmCryptSymFinal_t final; // libtpms added
BYTE *iv;
BYTE defaultIv[MAX_SYM_BLOCK_SIZE] = {0};
//
@ -295,16 +295,12 @@ CryptSymmetricEncrypt(
break;
#endif
default:
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) // libtpms added begin
FINAL(&keySchedule); // libtpms added end
return TPM_RC_FAILURE;
}
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) // libtpms added begin
FINAL(&keySchedule); // libtpms added end
return TPM_RC_SUCCESS;
}
/* 10.2.20.5.1 CryptSymmetricDecrypt() */
@ -335,7 +331,7 @@ CryptSymmetricDecrypt(
BYTE *iv;
TpmCryptSetSymKeyCall_t encrypt;
TpmCryptSetSymKeyCall_t decrypt;
TpmCryptSymFinal_t final; /* libtpms added */
TpmCryptSymFinal_t final; /* libtpms added */
BYTE defaultIv[MAX_SYM_BLOCK_SIZE] = {0};
memset(&keySchedule, 0, sizeof(keySchedule)); // libtpms added; coverity
@ -476,16 +472,12 @@ CryptSymmetricDecrypt(
break;
#endif
default:
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) /* libtpms added begin */
FINAL(&keySchedule); /* libtpms added end */
return TPM_RC_FAILURE;
}
// libtpms added begin
if (final)
FINAL(&keySchedule);
// libtpms added end
if (final) /* libtpms added begin */
FINAL(&keySchedule); /* libtpms added end */
return TPM_RC_SUCCESS;
}