From 4379f0d03128fb79006e597905ef5a997e332353 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Tue, 14 Nov 2017 14:20:10 +0100
Subject: [PATCH] u2f: show generic icon if specific is not found

---
 src/apps/fido_u2f/__init__.py          |   7 +++++--
 src/apps/fido_u2f/knownapps.py         |   1 +
 src/apps/fido_u2f/res/u2f_generic.toif | Bin 0 -> 594 bytes
 src/apps/fido_u2f/res/u2f_unknown.toif | Bin 980 -> 0 bytes
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/apps/fido_u2f/res/u2f_generic.toif
 delete mode 100644 src/apps/fido_u2f/res/u2f_unknown.toif

diff --git a/src/apps/fido_u2f/__init__.py b/src/apps/fido_u2f/__init__.py
index 4338ac70b..e21b046ee 100644
--- a/src/apps/fido_u2f/__init__.py
+++ b/src/apps/fido_u2f/__init__.py
@@ -413,10 +413,13 @@ class ConfirmContent(ui.Widget):
             icon = ui.ICON_RESET  # TODO: warning icon
         elif app_id in knownapps.knownapps:
             name = knownapps.knownapps[app_id]
-            icon = res.load('apps/fido_u2f/res/u2f_%s.toif' % name.lower().replace(' ', '_'))
+            try:
+                icon = res.load('apps/fido_u2f/res/u2f_%s.toif' % name.lower().replace(' ', '_'))
+            except:
+                icon = res.load('apps/fido_u2f/res/u2f_generic.toif')
         else:
             name = '%s...%s' % (ubinascii.hexlify(app_id[:4]), ubinascii.hexlify(app_id[-4:]))
-            icon = res.load('apps/fido_u2f/res/u2f_unknown.toif')
+            icon = res.load('apps/fido_u2f/res/u2f_generic.toif')
         self.app_name = name
         self.app_icon = icon
 
diff --git a/src/apps/fido_u2f/knownapps.py b/src/apps/fido_u2f/knownapps.py
index 4a9918fc4..aeb08f302 100644
--- a/src/apps/fido_u2f/knownapps.py
+++ b/src/apps/fido_u2f/knownapps.py
@@ -10,6 +10,7 @@ knownapps = {
     hashlib.sha256(b'https://gitlab.com').digest():                                    'GitLab',
     hashlib.sha256(b'https://keepersecurity.com').digest():                            'Keeper',
     hashlib.sha256(b'https://slushpool.com/static/security/u2f.json').digest():        'Slush Pool',
+    hashlib.sha256(b'https://u2f.bin.coffee').digest():                                'u2f.bin.coffee checker',
     hashlib.sha256(b'https://vault.bitwarden.com/app-id.json').digest():               'bitwarden',
     hashlib.sha256(b'https://www.bitfinex.com').digest():                              'Bitfinex',
     hashlib.sha256(b'https://www.dropbox.com/u2f-app-id.json').digest():               'Dropbox',
diff --git a/src/apps/fido_u2f/res/u2f_generic.toif b/src/apps/fido_u2f/res/u2f_generic.toif
new file mode 100644
index 0000000000000000000000000000000000000000..ccd0130fe7c37c008776e4214ac731d8e0594cce
GIT binary patch
literal 594
zcmV-Y0<Ha2Pf2D#06+jn0ssK*k|Aj0U=)BOB7RX3aU!Ckfr>krSfHYVn8qz|;tD4k
zs0igm852jTI7ZDV6=O_{QgMV62b~ynV$g|$)eJIG=!t`wK`JUDCL$stD&FPo813@^
z*|Oek$Kd~-Y5$l1eZ2QSLEvyW91e%W;c#9H#8N~>B&ENrQr`2cgQk#U<#v28YX_{{
z#-$^BnqT#+o;GO87p&Wj125~&*<s$?eO1c<Oe$=D_Yh#%qjI_KDMW-LzvZ`JiocCb
z`gVIAGf|!qTklu)=lTUK+db4tH2=Igo>cI^PFQ|VGwSA;4kf>;zj1PFd%HN1XYMs?
zPUye-@!0!6-5-w1$1#%x;9keK;CcLlu$bLqhjG%1_%eP*jkTBTpJvztI1fqb|M+zh
zjsR+z`1!5>>vQ|1UB3n3$aDt%5mPFFSpUkeh@KYR|H8`s@rR>$u>A42Tk@Z=bI7|-
z?mX(fD1A@zyK}X(aTyD5`75K2yUTXizW@f!r2f?o_7}}Afpq()<gv=~L>4$jfbJ>#
zo;k*Q{Wr;#)A<DfU&Oqj&*hnyjrMwtb!X=%?onHMsBT*S{%710ddiIhJeMyR?-F3|
zwamkH)B5F^-@+|YM0&n-hr}9u1n{dy{js`f{dX=;vxD-ndZd%a3BEk*b%`~pVCFn*
zOYw+LD!pG2jLq;H+-GVB^qc4e5>Y#=`=icETigADBTp($aoF4cpdPWlQu6(R9k4^5
g-T$_{X9w+d;Ykon+9ej<H;2RFa5x+ehx7XR4dmcDB>(^b

literal 0
HcmV?d00001

diff --git a/src/apps/fido_u2f/res/u2f_unknown.toif b/src/apps/fido_u2f/res/u2f_unknown.toif
deleted file mode 100644
index 8f7d1a18950ffdd37b0ce12edd018def0399d884..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 980
zcmV;_11tPgPf2D#06+l90{{TEk|AvRKorJLB2OR?2uLuvikVAh5C}*rddb9+{{*^f
zVq!VhpqeT|rU;@5rU_=rCYCURXJW}FmN0qp1fpW1e>%pt_S);+wfmmEd%ySI_W__T
z=y&^w4hPu9!M@z#0MTwA`rwb%SR-nio;5bcFry65vQ0!A>*~q15u$|UaJe}ML$o%k
ziVYncNRks%-~c+M_wHd=gZ(puTkGl5+no~Z?-|-1EqKc|OS8YqHbG1E?p3jmrQ!p0
zWV;eZnCx5GG(um-)y2u?oSugBaLz7X9`5cvOJV}QirqKYQI5j-bW-jHV&4hdoJR!;
zAIFAv4q9S*_!voPaU$viT6uWe6wse!>9J<J{7$x+O>cKZyKmnjB@ve2t=-9VUf|oJ
z9w};bE||dJQ-EF3_VhH1L7S`ByPM5*&IO+GJ7PCUhmL4_&&tZVcS+c>Hs={BtP4_T
zKqs+%AWH1&m23W<ye?tkoOeLf69>P%ABnan?B$`j_wp?LX8R$^;64MRBOg)Gq<i<9
z>E52jzv9wyD&#{%k9_gF*xl_%viNL~CsjUS2YO>Iy8hv1y0YGI{HB;cHX7^V>&w>i
zip$7#(Vv3@wppG|SU6AfXS<?bwi)yJEUDMsO`0A)@)=2&X8{2HBKM1HI*B;l-Anv5
zpx^EP1)W_KZy#5;Up9Ty+bBb_H$`+fC_|s^vgpOhJJxW3-4gWYEc)U^z5{k~pv^Zj
z>2;MJIMC-u?-`eWR_n3nyVd1xI#KO{UA_Df#x6Met$Lr~0MTl^U%e8h-UrccUx)8q
zrukz-r%$&JeVw1P=Olgmp|kzifIa}8rSAUnD#>47>F_-Z>}8wk{MBnJdlQ}O+h)vH
zPhh<N_U(76-|&#WnBQ2dCxEbI>CneUV+}r~`M+cl2EL^3KoxbkeyrL^-GLt$H2Fqt
z1ipm>b@uFe6>hFq;cTZf0}jA1K}Yohv>APi{Zro_Iv^qJs_ee~h!SEKYB#_xNU7G7
zzkqicaq=#eyzc={?T+mK*^cKg&*U%A?to0$rriHUJ%fKG%ePICr<PoY>4fJ`C$igv
zRxUqIfmHs&d73Y~eU|gT1s%BrCF!!+g$^hb^kq{>o8g=`7j@aoLmx;<@&=zy$i9@@
zT`dPHRpdLTmTgwWwoOsy^VROi=1P>*b_Zyy*28Xz84T<y-#sIZIMA5Ez=2BQ3hppM
zbf0y(DGb68t&KqCYOE2pP0z}i!|*KIM6|I6e=O*C`-lz)*u}xV+~EMxZXfzOz5W9o
Ca{&+l