From 43b5201a1e119d958886368f9051d2904ae54ef5 Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Thu, 8 Nov 2018 02:01:41 -0500
Subject: [PATCH] dont add uv option...

---
 fido2/ctap.c       | 17 ++++++++++-------
 fido2/ctap_parse.c |  3 ++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/fido2/ctap.c b/fido2/ctap.c
index 59080e2..871205c 100644
--- a/fido2/ctap.c
+++ b/fido2/ctap.c
@@ -165,16 +165,19 @@ uint8_t ctap_get_info(CborEncoder * encoder)
                     check_ret(ret);
                 }
 
-                ret = cbor_encode_text_string(&options, "uv", 2);
-                check_ret(ret);
-                {
-                    ret = cbor_encode_boolean(&options, 0);     // NOT [yet] capable of verifying user
-                    check_ret(ret);
-                }
+                // NOT [yet] capable of verifying user
+                // Do not add option if UV isn't supported.
+                //
+                // ret = cbor_encode_text_string(&options, "uv", 2);
+                // check_ret(ret);
+                // {
+                //     ret = cbor_encode_boolean(&options, 0);
+                //     check_ret(ret);
+                // }
                 ret = cbor_encode_text_string(&options, "clientPin", 9);
                 check_ret(ret);
                 {
-                    ret = cbor_encode_boolean(&options, ctap_is_pin_set());     // NOT [yet] capable of verifying user
+                    ret = cbor_encode_boolean(&options, ctap_is_pin_set());
                     check_ret(ret);
                 }
 
diff --git a/fido2/ctap_parse.c b/fido2/ctap_parse.c
index f776f23..1360d2b 100644
--- a/fido2/ctap_parse.c
+++ b/fido2/ctap_parse.c
@@ -678,12 +678,13 @@ uint8_t ctap_parse_make_credential(CTAP_makeCredential * MC, CborEncoder * encod
                 if (CTAP1_ERR_INVALID_LENGTH != ret)    // damn microsoft
                 {
                     check_retr(ret);
-                    MC->pinAuthPresent = 1;
+
                 }
                 else
                 {
                     ret = 0;
                 }
+                MC->pinAuthPresent = 1;
                 break;
             case MC_pinProtocol:
                 printf1(TAG_MC,"CTAP_pinProtocol\n");