Revert the TPM based key store (root of trust) for next release (not …

…ready).
wolfSSL · Jul 3, 2023 · 525a527 · 525a527
1 parent 4e20d5a
commit 525a527
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 907 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,10 +70,6 @@ tools/keytools/x64
 tools/keytools/Debug
 tools/keytools/Release
 
-# preseal binary
-tools/preseal/preseal
-tools/preseal/preseal.exe
-
 # delta binaries
 tools/delta/bmdiff
 tools/delta/bmpatch

diff --git a/Makefile b/Makefile
@@ -166,9 +166,6 @@ keytools:
 	@$(MAKE) -C tools/keytools clean
 	@$(MAKE) -C tools/keytools
 
-preseal:
-	@$(MAKE) -C tools/preseal
-
 test-app/image_v1_signed.bin: $(BOOT_IMG)
 	@echo "\t[SIGN] $(BOOT_IMG)"
 	$(Q)(test $(SIGN) = NONE) || $(SIGN_TOOL) $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1

diff --git a/config/examples/sim-tpm-keystore.config b/config/examples/sim-tpm-keystore.config
diff --git a/config/examples/stm32f4-tpm-keystore.config b/config/examples/stm32f4-tpm-keystore.config
diff --git a/docs/PubkeySealing.md b/docs/PubkeySealing.md
diff --git a/docs/Targets.md b/docs/Targets.md
@@ -64,48 +64,6 @@ On other systems, the SWAP space can be as small as 512B, if multiple smaller fl
 
 More information about the geometry of the flash and in-application programming (IAP) can be found in the manufacturer manual of each target device.
 
-### Using the TPM to store the verification public key
-
-If you want to keep your public key in the TPM, wolfBoot can unseal and use the key through wolfTPM by defining the following arguments in your config:
-
-```
-SIGN?=ECC256
-WOLFBOOT_TPM_KEYSTORE?=1
-WOLFBOOT_TPM_KEYSTORE_NV_INDEX?=0x01800200
-WOLFBOOT_TPM_POLICY_NV_INDEX?=0x01800201
-```
-
-You can also set a custom PCR index to use if the default 16 is not desired:
-
-```
-WOLFBOOT_TPM_PCR_INDEX?=15
-```
-
-Using this feature also requires you that keep 2 keys and use --manual-sign, the verification key for which the public section is kept in wolfTPM and the PolicySigned key for which the public section is bundled with the wolfBoot partation when /tools/keytools/sign is called. To create the PolicySigned signature you need hash and sign an expiration time as per the TPM2's documentation like below:
-
-```
-$ echo -n -e '\x00\x00\x00\x00' > zeroExpiry
-$ openssl dgst -sha256 -sign policy_signed_ecc.pem -out policySigned zeroExpiry
-```
-
-The output `policySigned` is in DER format and we need the signature in raw format, to convert we run the following commands:
-
-```
-$ openssl asn1parse -inform DER -in policySigned
-    0:d=0  hl=2 l=  69 cons: SEQUENCE
-    2:d=1  hl=2 l=  32 prim: INTEGER           :74BD2EAD183EE4B3A9A81ABC14B35DEB124148B9EF756C51B163A15CD9F37F7E
-   36:d=1  hl=2 l=  33 prim: INTEGER           :8A42B3E9CD1E7721B1697E08841D2982CC38756E6511938C2DB187FF16E5076C
-$ echo "74BD2EAD183EE4B3A9A81ABC14B35DEB124148B9EF756C51B163A15CD9F37F7E8A42B3E9CD1E7721B1697E08841D2982CC38756E6511938C2DB187FF16E5076C" | xxd -r -p - policySigned.raw
-```
-
-policySigned.raw will now only contain the raw signature as wolfBoot needs it. Then we can put everything together in our sign command with the --policy-signed and --manual-sign flags:
-
-```
-tools/keytools/sign --ecc256 --sha256 --manual-sign --policy-signed my_image.bin policy_signed_ecc.raw 1 my_image_sig policySigned.raw
-```
-
-#### NOTE: Currently tpm keystore only supports ECC256 as the key type
-
 ### STM32F4 Programming
 
 ```

diff --git a/include/image.h b/include/image.h
@@ -569,14 +569,6 @@ uint8_t* wolfBoot_peek_image(struct wolfBoot_image *img, uint32_t offset,
 uint16_t wolfBoot_find_header(uint8_t *haystack, uint16_t type, uint8_t **ptr);
 
 
-#if defined(WOLFBOOT_TPM) && defined(WOLFTPM_KEYSTORE)
-    #if defined(WOLFTPM_ENCRYPT_KEYSTORE) && defined(EXT_ENCRYPTED)
-int wolfBoot_unseal_encryptkey(uint8_t* key, uint32_t* keySz);
-    #endif
-
-int wolfBoot_reseal_keys(struct wolfBoot_image* newImg,
-    struct wolfBoot_image* backupImg);
-#endif
 
 #ifdef EXT_FLASH
 # ifdef PART_BOOT_EXT

diff --git a/options.mk b/options.mk
@@ -5,28 +5,6 @@ ifeq ($(MEASURED_BOOT),1)
   CFLAGS+=-D"WOLFBOOT_MEASURED_PCR_A=$(MEASURED_PCR_A)"
 endif
 
-## use tpm to store true pubkey
-ifeq ($(WOLFBOOT_TPM_KEYSTORE),1)
-  ifneq ($(WOLFBOOT_TPM_KEYSTORE_NV_INDEX),)
-    ifneq ($(WOLFBOOT_TPM_POLICY_NV_INDEX),)
-      WOLFTPM:=1
-      CFLAGS+=-DWOLFTPM_KEYSTORE -DWOLFTPM_KEYSTORE_INDEX=$(WOLFBOOT_TPM_KEYSTORE_NV_INDEX) -DWOLFTPM_POLICY_DIGEST_INDEX=$(WOLFBOOT_TPM_POLICY_NV_INDEX) -DWOLFSSL_AES_CFB
-
-      ifeq ($(WOLFBOOT_TPM_ENCRYPT_KEYSTORE),1)
-        ifneq ($(WOLFBOOT_TPM_ENCRYPT_KEYSTORE_NV_INDEX),)
-          CFLAGS+=-DWOLFTPM_ENCRYPT_KEYSTORE -DWOLFTPM_ENCRYPT_KEYSTORE_INDEX=$(WOLFBOOT_TPM_ENCRYPT_KEYSTORE_NV_INDEX)
-        endif
-      endif
-
-      ifeq ($(WOLFBOOT_TPM_PCR_INDEX),)
-        CFLAGS+=-DWOLFTPM_PCR_INDEX=16
-      else
-        CFLAGS+=-DWOLFTPM_PCR_INDEX=$(WOLFBOOT_TPM_PCR_INDEX)
-      endif
-    endif
-  endif
-endif
-
 ## DSA Settings
 
 ifeq ($(SIGN),NONE)