From 40ca2c9210f7422389bcc840501288e2b4e6d60a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 4 Jul 2016 15:44:47 +0200 Subject: [PATCH] add gitlab to u2f_knownapps --- firmware/u2f_knownapps.h | 49 ++++++++++++++++++++++--------------- gen/bitmaps.c | 2 ++ gen/bitmaps.h | 1 + gen/bitmaps/u2f_gitlab.png | Bin 0 -> 229 bytes 4 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 gen/bitmaps/u2f_gitlab.png diff --git a/firmware/u2f_knownapps.h b/firmware/u2f_knownapps.h index 396db6615..861227028 100644 --- a/firmware/u2f_knownapps.h +++ b/firmware/u2f_knownapps.h @@ -33,48 +33,57 @@ typedef struct { static const U2FWellKnown u2f_well_known[] = { { // https://www.gstatic.com/securitykey/origins.json - { 0xa5,0x46,0x72,0xb2,0x22,0xc4,0xcf,0x95, - 0xe1,0x51,0xed,0x8d,0x4d,0x3c,0x76,0x7a, - 0x6c,0xc3,0x49,0x43,0x59,0x43,0x79,0x4e, - 0x88,0x4f,0x3d,0x02,0x3a,0x82,0x29,0xfd }, + { 0xa5, 0x46, 0x72, 0xb2, 0x22, 0xc4, 0xcf, 0x95, + 0xe1, 0x51, 0xed, 0x8d, 0x4d, 0x3c, 0x76, 0x7a, + 0x6c, 0xc3, 0x49, 0x43, 0x59, 0x43, 0x79, 0x4e, + 0x88, 0x4f, 0x3d, 0x02, 0x3a, 0x82, 0x29, 0xfd }, "Google", &bmp_u2f_google }, { // https://github.com/u2f/trusted_facets - { 0x70,0x61,0x7d,0xfe,0xd0,0x65,0x86,0x3a, - 0xf4,0x7c,0x15,0x55,0x6c,0x91,0x79,0x88, - 0x80,0x82,0x8c,0xc4,0x07,0xfd,0xf7,0x0a, - 0xe8,0x50,0x11,0x56,0x94,0x65,0xa0,0x75 }, + { 0x70, 0x61, 0x7d, 0xfe, 0xd0, 0x65, 0x86, 0x3a, + 0xf4, 0x7c, 0x15, 0x55, 0x6c, 0x91, 0x79, 0x88, + 0x80, 0x82, 0x8c, 0xc4, 0x07, 0xfd, 0xf7, 0x0a, + 0xe8, 0x50, 0x11, 0x56, 0x94, 0x65, 0xa0, 0x75 }, "Github", &bmp_u2f_github }, { // https://www.dropbox.com/u2f-app-id.json - { 0xc5,0x0f,0x8a,0x7b,0x70,0x8e,0x92,0xf8, - 0x2e,0x7a,0x50,0xe2,0xbd,0xc5,0x5d,0x8f, - 0xd9,0x1a,0x22,0xfe,0x6b,0x29,0xc0,0xcd, - 0xf7,0x80,0x55,0x30,0x84,0x2a,0xf5,0x81 }, + { 0xc5, 0x0f, 0x8a, 0x7b, 0x70, 0x8e, 0x92, 0xf8, + 0x2e, 0x7a, 0x50, 0xe2, 0xbd, 0xc5, 0x5d, 0x8f, + 0xd9, 0x1a, 0x22, 0xfe, 0x6b, 0x29, 0xc0, 0xcd, + 0xf7, 0x80, 0x55, 0x30, 0x84, 0x2a, 0xf5, 0x81 }, "Dropbox", &bmp_u2f_dropbox }, { // https://slushpool.com/static/security/u2f.json - { 0x08,0xb2,0xa3,0xd4,0x19,0x39,0xaa,0x31, - 0x66,0x84,0x93,0xcb,0x36,0xcd,0xcc,0x4f, - 0x16,0xc4,0xd9,0xb4,0xc8,0x23,0x8b,0x73, - 0xc2,0xf6,0x72,0xc0,0x33,0x00,0x71,0x97 }, + { 0x08, 0xb2, 0xa3, 0xd4, 0x19, 0x39, 0xaa, 0x31, + 0x66, 0x84, 0x93, 0xcb, 0x36, 0xcd, 0xcc, 0x4f, + 0x16, 0xc4, 0xd9, 0xb4, 0xc8, 0x23, 0x8b, 0x73, + 0xc2, 0xf6, 0x72, 0xc0, 0x33, 0x00, 0x71, 0x97 }, "Slush Pool", &bmp_u2f_slushpool }, { // https://bitbucket.org - { 0x12,0x74,0x3b,0x92,0x12,0x97,0xb7,0x7f, - 0x11,0x35,0xe4,0x1f,0xde,0xdd,0x4a,0x84, - 0x6a,0xfe,0x82,0xe1,0xf3,0x69,0x32,0xa9, - 0x91,0x2f,0x3b,0x0d,0x8d,0xfb,0x7d,0x0e }, + { 0x12, 0x74, 0x3b, 0x92, 0x12, 0x97, 0xb7, 0x7f, + 0x11, 0x35, 0xe4, 0x1f, 0xde, 0xdd, 0x4a, 0x84, + 0x6a, 0xfe, 0x82, 0xe1, 0xf3, 0x69, 0x32, 0xa9, + 0x91, 0x2f, 0x3b, 0x0d, 0x8d, 0xfb, 0x7d, 0x0e }, "Bitbucket", &bmp_u2f_bitbucket + }, + { + // https://gitlab.com + { 0xe7, 0xbe, 0x96, 0xa5, 0x1b, 0xd0, 0x19, 0x2a, + 0x72, 0x84, 0x0d, 0x2e, 0x59, 0x09, 0xf7, 0x2b, + 0xa8, 0x2a, 0x2f, 0xe9, 0x3f, 0xaa, 0x62, 0x4f, + 0x03, 0x39, 0x6b, 0x30, 0xe4, 0x94, 0xc8, 0x04 }, + "Gitlab", + &bmp_u2f_gitlab } }; diff --git a/gen/bitmaps.c b/gen/bitmaps.c index 2d78497aa..13faa549e 100644 --- a/gen/bitmaps.c +++ b/gen/bitmaps.c @@ -26,6 +26,7 @@ const uint8_t bmp_logo64_empty_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x const uint8_t bmp_u2f_bitbucket_data[] = { 0x00, 0x3f, 0xf8, 0x00, 0x07, 0xff, 0xff, 0xc0, 0x1f, 0xff, 0xff, 0xf0, 0x3f, 0x00, 0x01, 0xf8, 0x3c, 0x00, 0x00, 0x78, 0x3f, 0x00, 0x01, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x1f, 0xe3, 0x8f, 0xf0, 0x1f, 0xe7, 0xcf, 0xf0, 0x1f, 0xe7, 0xcf, 0xf0, 0x1f, 0xe7, 0xcf, 0xf0, 0x0f, 0xe3, 0x8f, 0xe0, 0x0f, 0xf0, 0x1f, 0xe0, 0x0f, 0xf8, 0x3f, 0xe0, 0x07, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0x00, 0x04, 0x3f, 0xf8, 0x40, 0x07, 0x00, 0x01, 0xc0, 0x07, 0xc0, 0x07, 0xc0, 0x07, 0xff, 0xff, 0xc0, 0x07, 0xff, 0xff, 0xc0, 0x03, 0xff, 0xff, 0x80, 0x03, 0xff, 0xff, 0x80, 0x01, 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x0f, 0xe0, 0x00, }; const uint8_t bmp_u2f_dropbox_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x03, 0x00, 0x01, 0xf0, 0x0f, 0x80, 0x07, 0xf8, 0x1f, 0xe0, 0x0f, 0xfc, 0x3f, 0xf8, 0x3f, 0xfe, 0x7f, 0xfc, 0x7f, 0xfe, 0x7f, 0xff, 0x7f, 0xfc, 0x1f, 0xfe, 0x3f, 0xf0, 0x0f, 0xfc, 0x1f, 0xe0, 0x03, 0xf8, 0x07, 0x80, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x40, 0x03, 0x00, 0x00, 0x60, 0x07, 0x80, 0x01, 0xf0, 0x1f, 0xe0, 0x03, 0xf8, 0x3f, 0xf0, 0x0f, 0xfc, 0x7f, 0xfc, 0x3f, 0xfe, 0x7f, 0xfe, 0x7f, 0xfe, 0x1f, 0xfe, 0x7f, 0xfc, 0x0f, 0xfc, 0x3f, 0xf0, 0x03, 0xf9, 0x9f, 0xc0, 0x00, 0xe3, 0xc7, 0x80, 0x00, 0x47, 0xe2, 0x00, 0x03, 0x1f, 0xf8, 0x40, 0x03, 0xff, 0xfd, 0xc0, 0x01, 0xff, 0xff, 0x80, 0x00, 0x7f, 0xff, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, }; const uint8_t bmp_u2f_github_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x78, 0x1f, 0x80, 0x01, 0xf8, 0x1f, 0xe0, 0x03, 0xf8, 0x1f, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0xff, 0xfc, 0x3f, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xc0, 0xff, 0xfc, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 0x1f, 0xf8, 0x20, 0x04, 0x1f, 0xf0, 0x70, 0x0e, 0x0f, 0x70, 0xf0, 0x0f, 0x0e, 0x70, 0xf8, 0x1f, 0x0e, 0x70, 0x70, 0x0e, 0x0e, 0x30, 0x70, 0x0e, 0x0c, 0x38, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 0x70, 0x07, 0x80, 0x01, 0xe0, 0x01, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +const uint8_t bmp_u2f_gitlab_data[] = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x20, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x07, 0x00, 0x00, 0x70, 0x0f, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0xf8, 0x1f, 0x80, 0x01, 0xf8, 0x1f, 0x80, 0x01, 0xf8, 0x1f, 0x80, 0x01, 0xf8, 0x3f, 0xc0, 0x03, 0xfc, 0x3f, 0xc0, 0x03, 0xfc, 0x3f, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xfc, 0x1f, 0xff, 0xff, 0xf8, 0x07, 0xff, 0xff, 0xe0, 0x03, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0x80, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, }; const uint8_t bmp_u2f_google_data[] = { 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x01, 0xff, 0xff, 0x80, 0x03, 0xff, 0xff, 0xc0, 0x07, 0xf0, 0x0f, 0xe0, 0x0f, 0xc0, 0x03, 0xf0, 0x1f, 0x00, 0x01, 0xf8, 0x3e, 0x00, 0x00, 0xfc, 0x3c, 0x00, 0x01, 0xfc, 0x7c, 0x0f, 0xf3, 0xfe, 0x78, 0x1f, 0xff, 0xfe, 0x78, 0x3f, 0xff, 0xfe, 0xf0, 0x3f, 0xff, 0xff, 0xf0, 0x7f, 0xff, 0xff, 0xf0, 0x7f, 0x00, 0x1f, 0xf0, 0x7f, 0x00, 0x1f, 0xf0, 0x7f, 0x00, 0x1f, 0xf0, 0x7f, 0x00, 0x1f, 0xf0, 0x7f, 0xfe, 0x1f, 0xf0, 0x3f, 0xfe, 0x1f, 0x78, 0x3f, 0xfc, 0x1e, 0x78, 0x1f, 0xf8, 0x3e, 0x7c, 0x07, 0xf0, 0x3e, 0x3c, 0x00, 0x00, 0x7c, 0x3e, 0x00, 0x00, 0xfc, 0x1f, 0x00, 0x00, 0xf8, 0x0f, 0xc0, 0x03, 0xf0, 0x07, 0xf0, 0x0f, 0xe0, 0x03, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0x80, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x0f, 0xf0, 0x00, }; const uint8_t bmp_u2f_slushpool_data[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0x00, 0x00, 0x00, 0xef, 0x00, 0x00, 0x01, 0xee, 0x00, 0x01, 0xff, 0xff, 0x00, 0x01, 0xff, 0xff, 0xc0, 0x01, 0xff, 0xff, 0xe0, 0x03, 0xff, 0xff, 0xf0, 0x03, 0xff, 0xff, 0xf8, 0x00, 0xfe, 0x0f, 0xf8, 0x00, 0xfe, 0x03, 0xf8, 0x00, 0xfc, 0x03, 0xf8, 0x00, 0xfc, 0x03, 0xf8, 0x01, 0xfc, 0x03, 0xf8, 0x01, 0xfc, 0x03, 0xf0, 0x01, 0xfc, 0x07, 0xf0, 0x01, 0xfc, 0x1f, 0xf0, 0x0f, 0xff, 0xff, 0xe0, 0x0f, 0xff, 0xff, 0xe0, 0x0f, 0xff, 0xff, 0xc0, 0x0f, 0xff, 0xff, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x03, 0xf0, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; @@ -55,5 +56,6 @@ const BITMAP bmp_logo64_empty = {48, 64, bmp_logo64_empty_data}; const BITMAP bmp_u2f_bitbucket = {32, 32, bmp_u2f_bitbucket_data}; const BITMAP bmp_u2f_dropbox = {32, 32, bmp_u2f_dropbox_data}; const BITMAP bmp_u2f_github = {32, 32, bmp_u2f_github_data}; +const BITMAP bmp_u2f_gitlab = {32, 32, bmp_u2f_gitlab_data}; const BITMAP bmp_u2f_google = {32, 32, bmp_u2f_google_data}; const BITMAP bmp_u2f_slushpool = {32, 32, bmp_u2f_slushpool_data}; diff --git a/gen/bitmaps.h b/gen/bitmaps.h index 099943ce4..e109fd637 100644 --- a/gen/bitmaps.h +++ b/gen/bitmaps.h @@ -34,6 +34,7 @@ extern const BITMAP bmp_logo64_empty; extern const BITMAP bmp_u2f_bitbucket; extern const BITMAP bmp_u2f_dropbox; extern const BITMAP bmp_u2f_github; +extern const BITMAP bmp_u2f_gitlab; extern const BITMAP bmp_u2f_google; extern const BITMAP bmp_u2f_slushpool; diff --git a/gen/bitmaps/u2f_gitlab.png b/gen/bitmaps/u2f_gitlab.png new file mode 100644 index 0000000000000000000000000000000000000000..65c594905b9a776f42f18b1962bdb15f0187a273 GIT binary patch literal 229 zcmV^P)lnh~P}IH05!RFv&zDRA?A|5Q)ueRRzisWGR74`S(Y# z!g@vUB-acQ%h~TC7$%^}<-uU}SFXSjd7<10Ryns6^mhSEh5lR30cNg6(EbUtNwmVz zFJuP4D3CF9?uvwUy&mh|2>%E@0;RuOGDMYdLURs0< flZlRTA&9gS9LG;4emS$N00000NkvXXu0mjfu5n@$ literal 0 HcmV?d00001