Merge b604e17 into 721f6c2

stefanberger · Oct 13, 2021 · 0bf9df3 · 0bf9df3
2 parents 721f6c2 + b604e17
commit 0bf9df3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/src/tpm2/crypto/openssl/CryptCmac.c b/src/tpm2/crypto/openssl/CryptCmac.c
@@ -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;
 }
 

diff --git a/src/tpm2/crypto/openssl/CryptSym.c b/src/tpm2/crypto/openssl/CryptSym.c
@@ -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;
 }
 

diff --git a/src/tpm_tpm2_interface.c b/src/tpm_tpm2_interface.c
@@ -370,6 +370,9 @@ static char *TPM2_GetInfo(enum TPMLIB_InfoFlags flags)
     "\"TPMFeatures\":{"
         "\"RSAKeySizes\":[%s],"
         "\"CamelliaKeySizes\":[%s]"
+#if ALG_SM4
+        ", \"SM4KeySizes\":[128]"
+#endif
     "}";
     char *fmt = NULL, *buffer;
     bool printed = false;