Call setOutgoing only once

BryanJacobs · BryanJacobs · commit 8456609dcc41 · 2023-08-27T20:48:25.000+10:00
diff --git a/src/main/java/us/q3q/fido2/FIDO2Applet.java b/src/main/java/us/q3q/fido2/FIDO2Applet.java
@@ -4186,9 +4186,11 @@ private boolean streamOutgoingContinuation(APDU apdu, byte[] apduBytes, boolean
         }
 
         short chunkSize = (short)(APDU.getOutBlockSize() - 2);
-        final short requestedChunkSize = apdu.setOutgoing();
-        if (requestedChunkSize < chunkSize) {
-            chunkSize = requestedChunkSize;
+        if (chaining) {
+            final short requestedChunkSize = apdu.setOutgoing();
+            if (requestedChunkSize < chunkSize) {
+                chunkSize = requestedChunkSize;
+            }
         }
 
         final short writeSize = chunkSize <= outgoingRemaining ? chunkSize : outgoingRemaining;

Original file line number	Diff line number	Diff line change
`@@ -4186,9 +4186,11 @@ private boolean streamOutgoingContinuation(APDU apdu, byte[] apduBytes, boolean`
`4186`	`4186`	`}`
`4187`	`4187`
`4188`	`4188`	`short chunkSize = (short)(APDU.getOutBlockSize() - 2);`
`4189`		`- final short requestedChunkSize = apdu.setOutgoing();`
`4190`		`- if (requestedChunkSize < chunkSize) {`
`4191`		`- chunkSize = requestedChunkSize;`
	`4189`	`+ if (chaining) {`
	`4190`	`+ final short requestedChunkSize = apdu.setOutgoing();`
	`4191`	`+ if (requestedChunkSize < chunkSize) {`
	`4192`	`+ chunkSize = requestedChunkSize;`
	`4193`	`+ }`
`4192`	`4194`	`}`
`4193`	`4195`
`4194`	`4196`	`final short writeSize = chunkSize <= outgoingRemaining ? chunkSize : outgoingRemaining;`