working NewPCRs

Author: iolivergithub

tarzan/tpm2/endpointstpm2new.go

@@ -24,7 +24,40 @@ func openTPM(dev string) (transport.TPMCloser, error) {
 	return tpm, err
 }
 
+var npcrbanks = []tpm2.TPMIAlgHash{tpm2.TPMAlgSHA1, tpm2.TPMAlgSHA256, tpm2.TPMAlgSHA384, tpm2.TPMAlgSHA512}
+
 func NewPCRs(c echo.Context) error {
+
+	fmt.Println("NEW tpm2 pcrs called")
+
+	tpm, err := openTPM("/dev/tpmrm0")
+	if err != nil {
+		rtn := tpm2taErrorReturn{fmt.Sprintf("Could not open tpm with error %v", err.Error())}
+		return c.JSON(http.StatusUnprocessableEntity, rtn)
+	}
+	fmt.Printf("TPM device open by linuxtransport is %v\n", tpm)
+
+	for _, b := range npcrbanks {
+		for i := 0; i <= 23; i++ {
+			fmt.Printf("Reading back %v, pcr %v -->\n", b, i)
+
+			s2 := tpm2.TPMSPCRSelection{Hash: b, PCRSelect: tpm2.PCClientCompatible.PCRs(uint(i))}
+
+			pcrselections := []tpm2.TPMSPCRSelection{s2}
+			selection := tpm2.TPMLPCRSelection{PCRSelections: pcrselections}
+			fmt.Printf("PCR selection is %v\n", selection)
+
+			pcrreadresponse, err := tpm2.PCRRead{PCRSelectionIn: selection}.Execute(tpm)
+			fmt.Printf("PCR pcrreadresponse is %w, %v\n", err, pcrreadresponse)
+		}
+	}
+
+	return c.JSON(http.StatusOK, npcrbanks)
+}
+
+// IGNORE THIS CODE; IT WORKS SO I AM NOT TOUCHING IT
+
+func xNewPCRs(c echo.Context) error {
 	fmt.Println("NEW tpm2 pcrs called")
 
 	tpm, err := openTPM("/dev/tpmrm0")
@@ -34,11 +67,10 @@ func NewPCRs(c echo.Context) error {
 	}
 	fmt.Printf("TPM device open by linuxtranport is %v\n", tpm)
 
-	//DebugPCR := uint(16)
-	s1 := tpm2.TPMSPCRSelection{Hash: tpm2.TPMAlgSHA1, PCRSelect: tpm2.PCClientCompatible.PCRs(0, 1, 2, 3)}
-	//s2 := tpm2.TPMSPCRSelection{Hash: 0x000B, PCRSelect: []uint8{4, 5, 11, 16, 23}}
+	s1 := tpm2.TPMSPCRSelection{Hash: tpm2.TPMAlgSHA1, PCRSelect: tpm2.PCClientCompatible.PCRs(0)}
+	s2 := tpm2.TPMSPCRSelection{Hash: tpm2.TPMAlgSHA256, PCRSelect: tpm2.PCClientCompatible.PCRs(0)}
 
-	pcrselections := []tpm2.TPMSPCRSelection{s1}
+	pcrselections := []tpm2.TPMSPCRSelection{s1, s2}
 	selection := tpm2.TPMLPCRSelection{PCRSelections: pcrselections}
 	fmt.Printf("PCR selection is %v\n", selection)
 
@@ -47,5 +79,5 @@ func NewPCRs(c echo.Context) error {
 
 	//tpm2.PCRSelections{[]tpm2.PCRSelection{Hash: "sha256", PCRSelect: []byte{0, 1, 2, 3}}}
 
-	return c.JSON(http.StatusOK, "fred")
+	return c.JSON(http.StatusOK, pcrreadresponse)
 }