Title: [295616] trunk/Source
Revision
295616
Author
[email protected]
Date
2022-06-16 16:37:37 -0700 (Thu, 16 Jun 2022)

Log Message

[WebAuthn] Rename cable transport to hybrid
https://bugs.webkit.org/show_bug.cgi?id=241691
rdar://problem/95312126

Reviewed by Brent Fulgham.

This transport got renamed in https://github.com/fido-alliance/fido-2-specs/issues/1332

Hybrid is the name that should be used in AuthenticatorTransport, we continue to recgnize
the old string.

* Source/WebCore/Modules/webauthn/AuthenticatorTransport.h:
* Source/WebCore/Modules/webauthn/fido/AuthenticatorGetInfoResponse.cpp:
(fido::toString):
* Source/WebCore/Modules/webauthn/fido/DeviceResponseConverter.cpp:
(fido::convertStringToAuthenticatorTransport):
* Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:
(WebKit::LocalAuthenticatorInternal::transports):
* Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm:
(WebKit::toASCDescriptor):

Canonical link: https://commits.webkit.org/251621@main

Modified Paths

Diff

Modified: trunk/Source/WebCore/Modules/webauthn/AuthenticatorTransport.h (295615 => 295616)


--- trunk/Source/WebCore/Modules/webauthn/AuthenticatorTransport.h	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebCore/Modules/webauthn/AuthenticatorTransport.h	2022-06-16 23:37:37 UTC (rev 295616)
@@ -36,7 +36,8 @@
     Nfc,
     Ble,
     Internal,
-    Cable
+    Cable,
+    Hybrid
 };
 
 } // namespace WebCore
@@ -50,7 +51,8 @@
         WebCore::AuthenticatorTransport::Nfc,
         WebCore::AuthenticatorTransport::Ble,
         WebCore::AuthenticatorTransport::Internal,
-        WebCore::AuthenticatorTransport::Cable
+        WebCore::AuthenticatorTransport::Cable,
+        WebCore::AuthenticatorTransport::Hybrid
     >;
 };
 

Modified: trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h (295615 => 295616)


--- trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebCore/Modules/webauthn/WebAuthenticationConstants.h	2022-06-16 23:37:37 UTC (rev 295616)
@@ -95,6 +95,7 @@
 constexpr auto authenticatorTransportBle = "ble"_s;
 constexpr auto authenticatorTransportInternal = "internal"_s;
 constexpr auto authenticatorTransportCable = "cable"_s;
+constexpr auto authenticatorTransportHybrid = "hybrid"_s;
 
 } // namespace WebCore
 

Modified: trunk/Source/WebCore/Modules/webauthn/fido/AuthenticatorGetInfoResponse.cpp (295615 => 295616)


--- trunk/Source/WebCore/Modules/webauthn/fido/AuthenticatorGetInfoResponse.cpp	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebCore/Modules/webauthn/fido/AuthenticatorGetInfoResponse.cpp	2022-06-16 23:37:37 UTC (rev 295616)
@@ -100,6 +100,8 @@
         break;
     case WebCore::AuthenticatorTransport::Cable:
         return WebCore::authenticatorTransportCable;
+    case WebCore::AuthenticatorTransport::Hybrid:
+        return WebCore::authenticatorTransportHybrid;
     default:
         break;
     }

Modified: trunk/Source/WebCore/Modules/webauthn/fido/DeviceResponseConverter.cpp (295615 => 295616)


--- trunk/Source/WebCore/Modules/webauthn/fido/DeviceResponseConverter.cpp	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebCore/Modules/webauthn/fido/DeviceResponseConverter.cpp	2022-06-16 23:37:37 UTC (rev 295616)
@@ -66,6 +66,8 @@
         return AuthenticatorTransport::Internal;
     if (transport == authenticatorTransportCable)
         return AuthenticatorTransport::Cable;
+    if (transport == authenticatorTransportHybrid)
+        return AuthenticatorTransport::Hybrid;
     return std::nullopt;
 }
 

Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm (295615 => 295616)


--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm	2022-06-16 23:37:37 UTC (rev 295616)
@@ -200,7 +200,7 @@
 {
     Vector<WebCore::AuthenticatorTransport> transports = { WebCore::AuthenticatorTransport::Internal };
     if (shouldUpdateQuery())
-        transports.append(WebCore::AuthenticatorTransport::Cable);
+        transports.append(WebCore::AuthenticatorTransport::Hybrid);
     return transports;
 }
 

Modified: trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (295615 => 295616)


--- trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm	2022-06-16 23:23:20 UTC (rev 295615)
+++ trunk/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm	2022-06-16 23:37:37 UTC (rev 295616)
@@ -157,6 +157,9 @@
             case AuthenticatorTransport::Cable:
                 transportString = @"cable";
                 break;
+            case AuthenticatorTransport::Hybrid:
+                transportString = @"hybrid";
+                break;
             }
 
             if (transportString)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to