Don't init platform key for U2F

BryanJacobs · BryanJacobs · commit 54fd2276c19d · 2023-12-31T21:18:00.000+11:00
This key isn't used for anything in CTAP1, so wait until we receive a CTAP2 operation to initialize it.
diff --git a/src/main/java/us/q3q/fido2/FIDO2Applet.java b/src/main/java/us/q3q/fido2/FIDO2Applet.java
@@ -3444,8 +3444,6 @@ public void process(APDU apdu) throws ISOException {
             }
         }
 
-        initKeyAgreementKeyIfNecessary();
-
         if (attestationData != null && filledAttestationData < attestationData.length &&
                 transientStorage.getChainIncomingReadOffset() > 0 &&
                 bufferMem[0] == FIDOConstants.CMD_INSTALL_CERTS
@@ -3530,6 +3528,8 @@ public void process(APDU apdu) throws ISOException {
             return;
         }
 
+        initKeyAgreementKeyIfNecessary();
+
         if (apduBytes[ISO7816.OFFSET_CLA] != (byte) 0x80) {
             throwException(ISO7816.SW_CLA_NOT_SUPPORTED);
         }

Original file line number	Diff line number	Diff line change
`@@ -3444,8 +3444,6 @@ public void process(APDU apdu) throws ISOException {`
`3444`	`3444`	`}`
`3445`	`3445`	`}`
`3446`	`3446`
`3447`		`- initKeyAgreementKeyIfNecessary();`
`3448`		`-`
`3449`	`3447`	`if (attestationData != null && filledAttestationData < attestationData.length &&`
`3450`	`3448`	`transientStorage.getChainIncomingReadOffset() > 0 &&`
`3451`	`3449`	`bufferMem[0] == FIDOConstants.CMD_INSTALL_CERTS`
`@@ -3530,6 +3528,8 @@ public void process(APDU apdu) throws ISOException {`
`3530`	`3528`	`return;`
`3531`	`3529`	`}`
`3532`	`3530`
	`3531`	`+ initKeyAgreementKeyIfNecessary();`
	`3532`	`+`
`3533`	`3533`	`if (apduBytes[ISO7816.OFFSET_CLA] != (byte) 0x80) {`
`3534`	`3534`	`throwException(ISO7816.SW_CLA_NOT_SUPPORTED);`
`3535`	`3535`	`}`