utils: Hoist halg parameter, self-assign with RSA is compiled out.

Some gcc want the assignment outside the switch statement. Signed-off-by: Ken Goldman <[email protected]>
javieralso-arm · May 26, 2020 · aa6c6ec · aa6c6ec
1 parent 67c4a69
commit aa6c6ec
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/utils/cryptoutils.c b/utils/cryptoutils.c
@@ -1740,7 +1740,10 @@ TPM_RC verifySignatureFromPem(unsigned char *message,
 {
     TPM_RC 		rc = 0;
     EVP_PKEY 		*evpPkey = NULL;        /* OpenSSL public key, EVP format */
-
+#ifdef TPM_TSS_NORSA
+    halg = halg;
+#endif /* TPM_TSS_NORSA */
+
     /* read the public key from PEM format */
     if (rc == 0) {
 	rc = convertPemToEvpPubKey(&evpPkey,		/* freed @1*/
@@ -1758,8 +1761,6 @@ TPM_RC verifySignatureFromPem(unsigned char *message,
 						 halg,
 						 evpPkey);
 	    break;
-#else
-	    halg = halg;
 #endif /* TPM_TSS_NORSA */
 #ifndef TPM_TSS_NOECC
 	  case TPM_ALG_ECDSA: