Added TPM+RSA automated tests for jenkins

Author: danielinux

tools/test.mk

@@ -308,7 +308,7 @@ test-53-rollback-RSA: $(EXPVER) FORCE
 
 test-61-forward-update-no-downgrade-TPM: $(EXPVER) FORCE
 	@make test-tpm-on
-	@make test-01-forward-update-no-downgrade SIGN=ECC256 WOLFTPM=1
+	@make test-01-forward-update-no-downgrade SIGN=ECC256 WOLFTPM=1 TPM2=1
 	@make test-tpm-off
 
 test-63-rollback-TPM: $(EXPVER) FORCE
@@ -334,6 +334,16 @@ test-101-forward-update-no-downgrade-RSA2048-SHA3: $(EXPVER) FORCE
 test-111-forward-update-no-downgrade-RSA4096-SHA3: $(EXPVER) FORCE
 	@make test-01-forward-update-no-downgrade SIGN=RSA4096 HASH=SHA3
 
+test-161-forward-update-no-downgrade-TPM-RSA: $(EXPVER) FORCE
+	@make test-tpm-on
+	@make test-01-forward-update-no-downgrade SIGN=RSA2048 WOLFTPM=1
+	@make test-tpm-off
+
+test-163-rollback-TPM-RSA: $(EXPVER) FORCE
+	@make test-tpm-on
+	@make test-03-rollback SIGN=RSA2048 WOLFTPM=1
+	@make test-tpm-off
+
 test-all: clean test-01-forward-update-no-downgrade test-02-forward-update-allow-downgrade test-03-rollback \
 	test-11-forward-update-no-downgrade-ECC test-13-rollback-ECC test-21-forward-update-no-downgrade-SPI test-23-rollback-SPI \
 	test-34-forward-self-update \
@@ -347,4 +357,6 @@ test-all: clean test-01-forward-update-no-downgrade test-02-forward-update-allow
 	test-81-forward-update-no-downgrade-ED25519-SHA3 \
 	test-91-forward-update-no-downgrade-ECC256-SHA3 \
 	test-101-forward-update-no-downgrade-RSA2048-SHA3 \
-	test-111-forward-update-no-downgrade-RSA4096-SHA3
+	test-111-forward-update-no-downgrade-RSA4096-SHA3 \
+	test-161-forward-update-no-downgrade-TPM-RSA \
+	test-163-rollback-TPM-RSA