Repair info with certs / different buffer sizes

Author: BryanJacobs

src/main/java/us/q3q/fido2/FIDO2Applet.java

@@ -5513,7 +5513,7 @@ private void sendAuthInfo(APDU apdu) {
 
         short offset = 0;
 
-        byte numOptions = (byte) 0xB0;
+        short numOptions = 0x00B0;
         boolean includeMaxMsgSize = bufferMem.length != 1024;
         boolean includeCertifications = CERTIFICATION_LEVEL > 0;
         if (includeMaxMsgSize) {
@@ -5524,7 +5524,7 @@ private void sendAuthInfo(APDU apdu) {
         }
 
         buffer[offset++] = FIDOConstants.CTAP2_OK;
-        buffer[offset++] = numOptions; // Map - some number of options
+        buffer[offset++] = (byte) numOptions; // Map - some number of options
         buffer[offset++] = 0x01; // map key: versions
 
         if (alwaysUv || attestationData == null || filledAttestationData < attestationData.length) {
@@ -5581,8 +5581,7 @@ private void sendAuthInfo(APDU apdu) {
         if (includeMaxMsgSize) {
             buffer[offset++] = 0x05; // map key: maxMsgSize
             buffer[offset++] = 0x19; // two-byte integer
-            Util.setShort(buffer, offset, (short) bufferMem.length);
-            offset += 2;
+            offset = Util.setShort(buffer, offset, (short) bufferMem.length);
         }
 
         buffer[offset++] = 0x06; // map key: pinProtocols