Merge pull request #359 from dgarske/csr_ver

JacobBarthelmeh · web-flow · commit fb7e321ac0f5 · 2024-06-20T14:48:02.000-06:00
CSR version
diff --git a/src/tpm2_wrap.c b/src/tpm2_wrap.c
@@ -277,6 +277,9 @@ WOLFTPM2_CSR* wolfTPM2_NewCSR(void)
             XFREE(csr, NULL, DYNAMIC_TYPE_TMP_BUFFER);
             csr = NULL;
         }
+        if (csr) {
+            csr->req.version = 0; /* per RFC2986 : CSR version should be 0 */
+        }
     }
     return csr;
 }
@@ -6842,6 +6845,8 @@ int wolfTPM2_CSR_Generate_ex(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,
     XMEMSET(&csrKey, 0, sizeof(csrKey));
     rc = wc_InitCert(&csr.req);
     if (rc == 0) {
+        csr.req.version = 0; /* per RFC2986 : CSR version should be 0 */
+
         rc = CSR_KeySetup(dev, &csr, key, &csrKey, sigType, devId);
     }
     if (rc == 0) {

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,9 @@ WOLFTPM2_CSR* wolfTPM2_NewCSR(void)`
`277`	`277`	`XFREE(csr, NULL, DYNAMIC_TYPE_TMP_BUFFER);`
`278`	`278`	`csr = NULL;`
`279`	`279`	`}`
	`280`	`+ if (csr) {`
	`281`	`+ csr->req.version = 0; /* per RFC2986 : CSR version should be 0 */`
	`282`	`+ }`
`280`	`283`	`}`
`281`	`284`	`return csr;`
`282`	`285`	`}`
`@@ -6842,6 +6845,8 @@ int wolfTPM2_CSR_Generate_ex(WOLFTPM2_DEV* dev, WOLFTPM2_KEY* key,`
`6842`	`6845`	`XMEMSET(&csrKey, 0, sizeof(csrKey));`
`6843`	`6846`	`rc = wc_InitCert(&csr.req);`
`6844`	`6847`	`if (rc == 0) {`
	`6848`	`+ csr.req.version = 0; /* per RFC2986 : CSR version should be 0 */`
	`6849`	`+`
`6845`	`6850`	`rc = CSR_KeySetup(dev, &csr, key, &csrKey, sigType, devId);`
`6846`	`6851`	`}`
`6847`	`6852`	`if (rc == 0) {`