From 8eee6d2d124b3f51505b01e355bbb4d438e1b64d Mon Sep 17 00:00:00 2001
From: Andrew Kozlik <andrew.kozlik@gmail.com>
Date: Thu, 26 Sep 2019 16:22:32 +0200
Subject: [PATCH] common/webauthn: Add new URLs for gandi.net and Slush Pool.

(cherry picked from commit 6a33889706eac553129b14b08699da94a304f212)
---
 common/defs/webauthn/apps/gandi.json     | 3 ++-
 common/defs/webauthn/apps/slushpool.json | 2 +-
 core/src/apps/webauthn/knownapps.py      | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/defs/webauthn/apps/gandi.json b/common/defs/webauthn/apps/gandi.json
index bc329c242f..a220cd11ac 100644
--- a/common/defs/webauthn/apps/gandi.json
+++ b/common/defs/webauthn/apps/gandi.json
@@ -1,4 +1,5 @@
 {
   "label": "Gandi",
-  "u2f": ["https://account.gandi.net/api/u2f/trusted_facets.json"]
+  "u2f": ["https://account.gandi.net/api/u2f/trusted_facets.json"],
+  "webauthn": ["gandi.net"]
 }
diff --git a/common/defs/webauthn/apps/slushpool.json b/common/defs/webauthn/apps/slushpool.json
index 54fcf24565..3bb33a1f02 100644
--- a/common/defs/webauthn/apps/slushpool.json
+++ b/common/defs/webauthn/apps/slushpool.json
@@ -1,4 +1,4 @@
 {
   "label": "Slush Pool",
-  "u2f": ["https://slushpool.com/static/security/u2f.json"]
+  "u2f": ["https://slushpool.com/static/security/u2f.json", "https://slushpool.com/u2f.json"]
 }
diff --git a/core/src/apps/webauthn/knownapps.py b/core/src/apps/webauthn/knownapps.py
index 1268bbc790..23ad454290 100644
--- a/core/src/apps/webauthn/knownapps.py
+++ b/core/src/apps/webauthn/knownapps.py
@@ -42,11 +42,13 @@ _knownapps = {
         "label": "Slush Pool",
         "use_sign_count": True,
     },
+    "https://slushpool.com/u2f.json": {"label": "Slush Pool", "use_sign_count": True},
     "https://dashboard.stripe.com": {"label": "Stripe", "use_sign_count": True},
     "https://u2f.bin.coffee": {"label": "u2f.bin.coffee", "use_sign_count": True},
     # WebAuthn
     "www.binance.com": {"label": "Binance", "use_sign_count": False},
     "www.dropbox.com": {"label": "Dropbox"},
+    "gandi.net": {"label": "Gandi"},
     "github.com": {"label": "GitHub", "use_sign_count": True},
     "google.com": {"label": "Google"},
     "secure.login.gov": {"label": "login.gov"},