Fix incorrect cbor ordering

solokeys · Jan 28, 2021 · f90d8ca · f90d8ca
1 parent fe0b52b
commit f90d8ca
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/fido2/ctap.c b/fido2/ctap.c
@@ -165,10 +165,10 @@ uint8_t ctap_get_info(CborEncoder * encoder)
             ret = cbor_encoder_create_array(&map, &array, 2);
             check_ret(ret);
             {
-                ret = cbor_encode_text_stringz(&array, "hmac-secret");
+                ret = cbor_encode_text_stringz(&array, "credProtect");
                 check_ret(ret);
 
-                ret = cbor_encode_text_stringz(&array, "credProtect");
+                ret = cbor_encode_text_stringz(&array, "hmac-secret");
                 check_ret(ret);
             }
             ret = cbor_encoder_close_container(&map, &array);
@@ -548,24 +548,25 @@ static int ctap_make_extensions(CTAP_extensions * ext, uint8_t * ext_encoder_buf
                     check_ret(ret);
                 }
             }
-            if (hmac_secret_requested_is_valid) {
+            if (cred_protect_is_valid) {
                 {
-                    ret = cbor_encode_text_stringz(&extension_output_map, "hmac-secret");
+                    ret = cbor_encode_text_stringz(&extension_output_map, "credProtect");
                     check_ret(ret);
 
-                    ret = cbor_encode_boolean(&extension_output_map, 1);
+                    ret = cbor_encode_int(&extension_output_map, ext->cred_protect);
                     check_ret(ret);
                 }
             }
-            if (cred_protect_is_valid) {
+            if (hmac_secret_requested_is_valid) {
                 {
-                    ret = cbor_encode_text_stringz(&extension_output_map, "credProtect");
+                    ret = cbor_encode_text_stringz(&extension_output_map, "hmac-secret");
                     check_ret(ret);
 
-                    ret = cbor_encode_int(&extension_output_map, ext->cred_protect);
+                    ret = cbor_encode_boolean(&extension_output_map, 1);
                     check_ret(ret);
                 }
             }
+
             ret = cbor_encoder_close_container(&extensions, &extension_output_map);
             check_ret(ret);