From 627211bf2f9ed2a3acbffd67147ed24d1b0093f5 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:18:10 +0100 Subject: [PATCH 1/9] Updated the x509 package --- pubspec.lock | 6 +++--- pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 780d044..efdad93 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -413,11 +413,11 @@ packages: dependency: "direct main" description: path: "." - ref: "0.2.8" - resolved-ref: "087786c37fe1720cbc0dc5ad300f75f15f63f664" + ref: "0.2.9" + resolved-ref: "1e58d8c97d1eda594acbe3a40acf9221dc768d0c" url: "https://github.com/jeroentrappers/x509" source: git - version: "0.2.8" + version: "0.2.9" yaml: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index eb40c91..3158cc3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: x509b: git: url: https://github.com/jeroentrappers/x509 - ref: 0.2.8 + ref: 0.2.9 ninja: ^3.0.2 dev_dependencies: From 58236ef50eea009c931f5f29106858990c08825e Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:18:42 +0100 Subject: [PATCH 2/9] Updated changelog --- CHANGELOG.md | 3 +++ pubspec.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92769cd..dcfd521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [1.1.11] +- updated x509 + ## [1.1.10] - return kid in CoseResult - Fixed CoseLogger diff --git a/pubspec.yaml b/pubspec.yaml index 3158cc3..2949ffc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_cose description: Partial Dart implementation of COSE, RFC8152. It is used to validate European Digital Green Certificates. -version: 1.1.10 +version: 1.1.11 homepage: https://github.com/jeroentrappers/dart_cose environment: From b7b45c731a584b1b6c3a2cf4fb13e272df41e8d0 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:20:41 +0100 Subject: [PATCH 3/9] Fixed formatting --- test/dart_cose_test.dart | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/test/dart_cose_test.dart b/test/dart_cose_test.dart index 5025cab..b7ba766 100644 --- a/test/dart_cose_test.dart +++ b/test/dart_cose_test.dart @@ -24,12 +24,13 @@ void main() { test('validate example QR string', () async { var stopwatch = Stopwatch()..start(); var result = Cose.decodeAndVerify( - unChain( - '''HC1:NCF3TDJ%B6FLSTSTYOEKDNXP4H5UV0CXH9M9ESIM NHXK.7TKZ65B9B+PLLC5VC9:BXCNUKMUB4WXKYKMXEE1JAA/C5/DEEA+ZAREDHNHZFC3IKKOL0PK\$2MXGGM+G\$C9EOJI1MNPL+JNIMH7I99QM/FJVCI0DJ WJ/Q6395J4I-B5ET42HPPEPHCRSV8OEQAC5ADNA2P 96PTMKP8DK4LC6DQ4ZIOXHM4FA.KMQP4L7O/VMGF6:/6N9R%EPXCROGO CODFLXQ6Z6NC8P\$WA3AA9EPBDSM+Q8H4O670C57Q4UYQD*O%+Q.SQBDOBKLP64-HQ/HQ+DR-DP71AAKPCPP0%M\$76NV6FJB 1JI7JSTNB95526NL7.KMM473X73ZPMIU1RKA+QIUSQ*N8%MKMI72EWBPHJSC.UPLI906\$8R-3FW8O84B1-ST*QGTA4W7.Y7U01.BUV2U:T2J V5XJ623XXJJPSJ H823I3W..2O56RAIR8L3:EPOSP6KHAO506%.NUKKL7VAAOL26IUR+ZPCR7P 5JBF6RL6AL3:Q:.CI00E6TS3'''), - { - 'uE7ViYTSegg=': - '''MIICyzCCAnGgAwIBAgIBATAKBggqhkjOPQQDAjCBqTELMAkGA1UEBhMCREsxKTAnBgNVBAoMIFRoZSBEYW5pc2ggSGVhbHRoIERhdGEgQXV0aG9yaXR5MSkwJwYDVQQLDCBUaGUgRGFuaXNoIEhlYWx0aCBEYXRhIEF1dGhvcml0eTEcMBoGA1UEAwwTVEVTVF9DU0NBX0RHQ19ES18wMTEmMCQGCSqGSIb3DQEJARYXa29udGFrdEBzdW5kaGVkc2RhdGEuZGswHhcNMjEwNTA2MDcxMzI1WhcNMjMwNTA3MDcxMzI1WjCBqDELMAkGA1UEBhMCREsxKTAnBgNVBAoMIFRoZSBEYW5pc2ggSGVhbHRoIERhdGEgQXV0aG9yaXR5MSkwJwYDVQQLDCBUaGUgRGFuaXNoIEhlYWx0aCBEYXRhIEF1dGhvcml0eTEbMBkGA1UEAwwSVEVTVF9EU0NfREdDX0RLXzAxMSYwJAYJKoZIhvcNAQkBFhdrb250YWt0QHN1bmRoZWRzZGF0YS5kazBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL0JDUKq2pxjU5RxY1l8bdGpTNRJtAcpdCt+NeCvi4eEhTPz7KIddqBqG4TbylBMqTDYCHrsTxOP4iBRrQE3pyWjgYgwgYUwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQi6XXC6dQ17M3qyUDZMQPB7ecD7zAfBgNVHSMEGDAWgBS43XjKHFShS4ohleIhOwzEaOS38DAzBgNVHSUELDAqBgwrBgEEAQCON49lAQEGDCsGAQQBAI43j2UBAgYMKwYBBAEAjjePZQEDMAoGCCqGSM49BAMCA0gAMEUCIF7fye27ODGr5oHpPmzGAF32/S8v+9YBtaWsCPg3vzNKAiEAxhxPz1lJo7oHZE5HXq71fOi62hoTxQvK08glhlq228s=''' - }); + unChain( + '''HC1:NCF3TDJ%B6FLSTSTYOEKDNXP4H5UV0CXH9M9ESIM NHXK.7TKZ65B9B+PLLC5VC9:BXCNUKMUB4WXKYKMXEE1JAA/C5/DEEA+ZAREDHNHZFC3IKKOL0PK\$2MXGGM+G\$C9EOJI1MNPL+JNIMH7I99QM/FJVCI0DJ WJ/Q6395J4I-B5ET42HPPEPHCRSV8OEQAC5ADNA2P 96PTMKP8DK4LC6DQ4ZIOXHM4FA.KMQP4L7O/VMGF6:/6N9R%EPXCROGO CODFLXQ6Z6NC8P\$WA3AA9EPBDSM+Q8H4O670C57Q4UYQD*O%+Q.SQBDOBKLP64-HQ/HQ+DR-DP71AAKPCPP0%M\$76NV6FJB 1JI7JSTNB95526NL7.KMM473X73ZPMIU1RKA+QIUSQ*N8%MKMI72EWBPHJSC.UPLI906\$8R-3FW8O84B1-ST*QGTA4W7.Y7U01.BUV2U:T2J V5XJ623XXJJPSJ H823I3W..2O56RAIR8L3:EPOSP6KHAO506%.NUKKL7VAAOL26IUR+ZPCR7P 5JBF6RL6AL3:Q:.CI00E6TS3'''), + { + 'uE7ViYTSegg=': + '''MIICyzCCAnGgAwIBAgIBATAKBggqhkjOPQQDAjCBqTELMAkGA1UEBhMCREsxKTAnBgNVBAoMIFRoZSBEYW5pc2ggSGVhbHRoIERhdGEgQXV0aG9yaXR5MSkwJwYDVQQLDCBUaGUgRGFuaXNoIEhlYWx0aCBEYXRhIEF1dGhvcml0eTEcMBoGA1UEAwwTVEVTVF9DU0NBX0RHQ19ES18wMTEmMCQGCSqGSIb3DQEJARYXa29udGFrdEBzdW5kaGVkc2RhdGEuZGswHhcNMjEwNTA2MDcxMzI1WhcNMjMwNTA3MDcxMzI1WjCBqDELMAkGA1UEBhMCREsxKTAnBgNVBAoMIFRoZSBEYW5pc2ggSGVhbHRoIERhdGEgQXV0aG9yaXR5MSkwJwYDVQQLDCBUaGUgRGFuaXNoIEhlYWx0aCBEYXRhIEF1dGhvcml0eTEbMBkGA1UEAwwSVEVTVF9EU0NfREdDX0RLXzAxMSYwJAYJKoZIhvcNAQkBFhdrb250YWt0QHN1bmRoZWRzZGF0YS5kazBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL0JDUKq2pxjU5RxY1l8bdGpTNRJtAcpdCt+NeCvi4eEhTPz7KIddqBqG4TbylBMqTDYCHrsTxOP4iBRrQE3pyWjgYgwgYUwDgYDVR0PAQH/BAQDAgeAMB0GA1UdDgQWBBQi6XXC6dQ17M3qyUDZMQPB7ecD7zAfBgNVHSMEGDAWgBS43XjKHFShS4ohleIhOwzEaOS38DAzBgNVHSUELDAqBgwrBgEEAQCON49lAQEGDCsGAQQBAI43j2UBAgYMKwYBBAEAjjePZQEDMAoGCCqGSM49BAMCA0gAMEUCIF7fye27ODGr5oHpPmzGAF32/S8v+9YBtaWsCPg3vzNKAiEAxhxPz1lJo7oHZE5HXq71fOi62hoTxQvK08glhlq228s=''' + }, + ); print("took: " + stopwatch.elapsedMilliseconds.toString()); print(result.errorCode); expect(result.verified, true); @@ -39,28 +40,29 @@ void main() { test('validate example QR string for UK', () async { var stopwatch = Stopwatch()..start(); var result = Cose.decodeAndVerify( - unChain( - r'HC1:6BFOXNYTSMAHN-HUVQG:M89AP77N$O6E8N+M3XHV5U6R5JEHHTBAVD A13/4X6BMF6.UCOMI6+QBR7BD7LG8CU6O8QGU68ORJSPZHQW1SZSP:*PG+QV*OEHP/ROMHPO/5 QGU65F4TKRN95U/38T9:H9P1J4HGZJK:HGX2MI C+G9BYI970SC9EY8R2KK3M8FFZ.C-3N$29ALG:.C+-CBJC5IAXMFU*GSHGRKMXGG%DBZI9$JAQJKN94J7J43M3Z8.-B97U: KUZNP3F.6O4DRI%K/YN3CR9*O3-S-YNNCLBLEH-BKMHFDJ:2CUDBQEAJJKKKMWC8WYOZM1NLKA8TK6IR$0/KQ4WDEK4*UO5U9/GJ07QJ1R1*595G QF$1WQ-K.XSDHF6$7DTMTL9YZ928NEOAS:9UAR64NL9K32N YAVGSHB06%C05D'), - { - r'S2V5MS1zaXQx': - r'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECyzJjCOd6AZI85tOFAtvagr0MUcnM11ces2tHHsjg/TiEUX0M6tfNJloc27xeLbvrphVUDM5RoLtinu5bCQ1ug==' - }); + unChain( + r'HC1:6BFOXNYTSMAHN-HUVQG:M89AP77N$O6E8N+M3XHV5U6R5JEHHTBAVD A13/4X6BMF6.UCOMI6+QBR7BD7LG8CU6O8QGU68ORJSPZHQW1SZSP:*PG+QV*OEHP/ROMHPO/5 QGU65F4TKRN95U/38T9:H9P1J4HGZJK:HGX2MI C+G9BYI970SC9EY8R2KK3M8FFZ.C-3N$29ALG:.C+-CBJC5IAXMFU*GSHGRKMXGG%DBZI9$JAQJKN94J7J43M3Z8.-B97U: KUZNP3F.6O4DRI%K/YN3CR9*O3-S-YNNCLBLEH-BKMHFDJ:2CUDBQEAJJKKKMWC8WYOZM1NLKA8TK6IR$0/KQ4WDEK4*UO5U9/GJ07QJ1R1*595G QF$1WQ-K.XSDHF6$7DTMTL9YZ928NEOAS:9UAR64NL9K32N YAVGSHB06%C05D'), + { + r'S2V5MS1zaXQx': + r'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECyzJjCOd6AZI85tOFAtvagr0MUcnM11ces2tHHsjg/TiEUX0M6tfNJloc27xeLbvrphVUDM5RoLtinu5bCQ1ug==', + }, + ); print("took: " + stopwatch.elapsedMilliseconds.toString()); print(result.errorCode); expect(result.verified, true); expect(result.errorCode, CoseErrorCode.none); }); - test('validate example QR string for Northern Ireland', () async { var stopwatch = Stopwatch()..start(); var result = Cose.decodeAndVerify( - unChain( - r'HC1:NCFOXN%TSMAHN-H*ZS6/V7-VC9QWNCKW8VWBZEJE8UXG4-55WIU:X9UCA$Z5 NI4EFSYS:%OD3PYE9*FJRLDQC8$.AIGCY0K5$0O:AT+9Q:GM+81$4$/I**4V.GPLK$7UVGIA2LK8UM1M0OPD68IMI4UUIMI.J9WVHWVH+ZE6%PUU1VLICUH+ZB:H1IRHHKE2YU7T2 UQ7S7TK24H9HT2RT7/IE%TE6UG+ZE V1+GO9+PGF6Z6NC8P$WA3AAPEPBDSM+Q9I6O670C57Q4UYQD*O%+Q.SQBDOBKLP64-HQ/HQ3IRE+QJDO4A7R/7-9DXGGX2MCJJBIKSKE MCAOI8%MEWI4DR%CI4UES-JC0JOD0E$KZ33/HLIJLKNF8JF172926QDJ+:38EI0UFT*H:5B6UO9KQ00A$RVX.KG9HD3T-UM40W72R CVU3QDS6YEUHIF1YNDR8GO7.CD6SBIMEF.QHQGS9RH2G94GCBVS10:2NG0'), - { - r'1J9pb87ndV0=': - r'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZ+fdcTa4UWA/6PT5V4a0+0j1/s++4JQEsW/HvGnxxP7mGfuQDfn/FRdUMGQtTkoCGaky1gpYVZXkkoYu9ZjlUw==' - }); + unChain( + r'HC1:NCFOXN%TSMAHN-H*ZS6/V7-VC9QWNCKW8VWBZEJE8UXG4-55WIU:X9UCA$Z5 NI4EFSYS:%OD3PYE9*FJRLDQC8$.AIGCY0K5$0O:AT+9Q:GM+81$4$/I**4V.GPLK$7UVGIA2LK8UM1M0OPD68IMI4UUIMI.J9WVHWVH+ZE6%PUU1VLICUH+ZB:H1IRHHKE2YU7T2 UQ7S7TK24H9HT2RT7/IE%TE6UG+ZE V1+GO9+PGF6Z6NC8P$WA3AAPEPBDSM+Q9I6O670C57Q4UYQD*O%+Q.SQBDOBKLP64-HQ/HQ3IRE+QJDO4A7R/7-9DXGGX2MCJJBIKSKE MCAOI8%MEWI4DR%CI4UES-JC0JOD0E$KZ33/HLIJLKNF8JF172926QDJ+:38EI0UFT*H:5B6UO9KQ00A$RVX.KG9HD3T-UM40W72R CVU3QDS6YEUHIF1YNDR8GO7.CD6SBIMEF.QHQGS9RH2G94GCBVS10:2NG0'), + { + r'1J9pb87ndV0=': + r'MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZ+fdcTa4UWA/6PT5V4a0+0j1/s++4JQEsW/HvGnxxP7mGfuQDfn/FRdUMGQtTkoCGaky1gpYVZXkkoYu9ZjlUw==', + }, + ); print("took: " + stopwatch.elapsedMilliseconds.toString()); print(result.errorCode); expect(result.verified, true); From f8f0e3118b0ca4ae9a5f2fdcd257b76551dcd694 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:20:58 +0100 Subject: [PATCH 4/9] Fixed formatting --- test/dart_cose_test.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/test/dart_cose_test.dart b/test/dart_cose_test.dart index b7ba766..926c6ae 100644 --- a/test/dart_cose_test.dart +++ b/test/dart_cose_test.dart @@ -68,5 +68,4 @@ void main() { expect(result.verified, true); expect(result.errorCode, CoseErrorCode.none); }); - } From 6aab1d4a484f52541da4106a7977a57ed6a24513 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:36:03 +0100 Subject: [PATCH 5/9] Updated travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 19546e9..c23a7b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ dart: dart_task: - test - dartanalyzer: --fatal-warnings . - - dartfmt + - format . From 6903fb6dea0e6e14ee54d9b9c9df1434f8319a3c Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:44:15 +0100 Subject: [PATCH 6/9] Test travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c23a7b8..f844693 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ dart: dart_task: - test - dartanalyzer: --fatal-warnings . - - format . + - dart format . From 53f18462fa33b136dfa9a4302bde0a28ffc7d9d4 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:46:59 +0100 Subject: [PATCH 7/9] Test travis ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f844693..c83b9a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ dart: dart_task: - test - dartanalyzer: --fatal-warnings . - - dart format . + - dartfmt: true From e9ab7336d0f431f6e6aacd0a14b4bbd45e531119 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:50:34 +0100 Subject: [PATCH 8/9] Updated travis format ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c83b9a9..c23a7b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ dart: dart_task: - test - dartanalyzer: --fatal-warnings . - - dartfmt: true + - format . From 8d4b2a636fc0671847f99ddc73867b030402e764 Mon Sep 17 00:00:00 2001 From: Koen Van Looveren Date: Thu, 30 Dec 2021 09:59:44 +0100 Subject: [PATCH 9/9] Updated travis format ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c23a7b8..19546e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ dart: dart_task: - test - dartanalyzer: --fatal-warnings . - - format . + - dartfmt