From f6d2b35318aef09ad857e733dde12a068cf7d161 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 13:04:35 +0200 Subject: [PATCH 1/7] Fix issue with Trust Enum values As `auto()` was not used for `Trust.unknown` it led to wrong data being returned from `trust_color()`. --- libkeyringctl/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libkeyringctl/types.py b/libkeyringctl/types.py index 98222cd..a19c1a9 100644 --- a/libkeyringctl/types.py +++ b/libkeyringctl/types.py @@ -11,7 +11,7 @@ PacketKind = NewType("PacketKind", str) class Trust(Enum): - unknown = auto + unknown = auto() revoked = auto() marginal = auto() full = auto() From ddc037fa336996e887278c0bbc806146682b7402 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 13:09:32 +0200 Subject: [PATCH 2/7] Simplify trust_color() using match statement --- libkeyringctl/trust.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libkeyringctl/trust.py b/libkeyringctl/trust.py index 7911b60..67ea0ed 100644 --- a/libkeyringctl/trust.py +++ b/libkeyringctl/trust.py @@ -224,16 +224,13 @@ def trust_color(trust: Trust) -> Color: ------- The color representing the passed trust status """ - color: Color = Color.RED - if trust == Trust.revoked: - color = Color.RED - if trust == Trust.unknown: - color = Color.YELLOW - if trust == Trust.marginal: - color = Color.YELLOW - if trust == Trust.full: - color = Color.GREEN - return color + match trust: + case Trust.full: + return Color.GREEN + case Trust.unknown | Trust.marginal: + return Color.YELLOW + case _: + return Color.RED def format_trust_label(trust: Trust) -> str: From f4ad2ed61ae4a0c0e61fb493a38aa22b1f879e3b Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 12:54:32 +0200 Subject: [PATCH 3/7] Add signature from Foxboron for dvzrv --- .../C100346676634E80C940FB9E9C02FF419FECBE16.asc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/C100346676634E80C940FB9E9C02FF419FECBE16.asc diff --git a/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/C100346676634E80C940FB9E9C02FF419FECBE16.asc b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/C100346676634E80C940FB9E9C02FF419FECBE16.asc new file mode 100644 index 0000000..de27c83 --- /dev/null +++ b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/C100346676634E80C940FB9E9C02FF419FECBE16.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFzBBABCgAdFiEEwQA0ZnZjToDJQPuenAL/QZ/svhYFAl3QLJMACgkQnAL/QZ/s +vhZfmg//S04yCxS1km9rbTdRv+k9bHHuuuE7jAcGXdjg2DUUexeJBabtRPSUALQ7 +qveI1mPyCc5JpnSz5yy70g0mwftMS4y9JAMr74CSi8xraJHR0pxJ7g6/V8LovXhm +6v4rIGDSpu6Zuqa56S9gGsjBMOfpAlEijtr4Ci/d4AltD0lxMzop3vPFXv7HiGiU +/PeERZhqp1akFg+guz7bSu+F6GdGZkCty0tlkA82zRQ8Ummq/8qSKM5HUDQGL/+4 +g+MAroocB4CQaBN/4F+WTS90dtBnFYBVzWvdlnfIpzI++ELVTxKpieWk9aOuxjQQ +c4tzdF6ZJIzym/nWfTCzfRz0z0vz1cISNxYfSlFmSjmxWtMmaFwInxlBnBjkUYTc +lOiMeitQrDXZAz8tRd6xiGm/8tWNiX97RQq1IdCRJRyzuYY2hHsGcW2j8QR5FkIQ +dHUTMIqu+Tx6ueAc3FYHv0ykWh1gSR048cv55vEIf8pN6CGstzsjbRyuWkz2gH/L +eb4IifrKsDniZdyLpDBApUxKD1PUfgxOZjs+Flfuyq92zjcP90IfLQZxk2aIYxul +dQAhaQE4a5LR/lVpFAgGNKrIGMfU8e0B7cohHXmp5LWoWUFIvdKu46qak0jnL4/v +bzt4wgoukgixomY029arCwUk/cFk7DCy4TbQd1yH2gmnR2nqRPs= +=mOF3 +-----END PGP SIGNATURE----- From 75b363ac6c02bf336a31d60a42ed6e8e35f4a55c Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 13:14:50 +0200 Subject: [PATCH 4/7] Add certification from dvzrv for dvzrv Add signature by 991F6E3F0765CF6295888586139B09DA5BF0D338 on C7E7849466FE2358343588377258734B41C31549 for "David Runge ". --- .../991F6E3F0765CF6295888586139B09DA5BF0D338.asc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/991F6E3F0765CF6295888586139B09DA5BF0D338.asc diff --git a/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/991F6E3F0765CF6295888586139B09DA5BF0D338.asc b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/991F6E3F0765CF6295888586139B09DA5BF0D338.asc new file mode 100644 index 0000000..a272277 --- /dev/null +++ b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/uid/David_Runge__dvzrv@archlinux.org_d2ad250f/certification/991F6E3F0765CF6295888586139B09DA5BF0D338.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +wnUEExYKAB0WIQSZH24/B2XPYpWIhYYTmwnaW/DTOAUCYno0+wAKCRATmwnaW/DT +OE5uAP9+xvb8/oqmh2UxW32sRmRz42GuGf3KatBH1D1WlYXz3QD/coRmCwXFvBCP +lEhU5DFPDrsI/U+pNz0F1uWdCsM94Qc= +=Z+gq +-----END PGP SIGNATURE----- From a6c89532b11a370f88cfbc0947682c4e44cc6465 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 13:13:56 +0200 Subject: [PATCH 5/7] Add authentication subkey for dvzrv Add authentication subkey 57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108 for C7E7849466FE2358343588377258734B41C31549. --- .../57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108.asc | 6 ++++++ .../C7E7849466FE2358343588377258734B41C31549.asc | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108.asc create mode 100644 keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/certification/C7E7849466FE2358343588377258734B41C31549.asc diff --git a/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108.asc b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108.asc new file mode 100644 index 0000000..b334979 --- /dev/null +++ b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP ARMORED FILE----- + +zjMEXzjyGhYJKwYBBAHaRw8BAQdAlC/1ysofcEnEhTtUnu/0z1UuAfbzL3r4K+tH ++ZZpuiQ= +=FnQP +-----END PGP ARMORED FILE----- diff --git a/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/certification/C7E7849466FE2358343588377258734B41C31549.asc b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/certification/C7E7849466FE2358343588377258734B41C31549.asc new file mode 100644 index 0000000..b887f13 --- /dev/null +++ b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/subkey/57B71EE573F78CBEA83284B0D0B9A7F0EFEC1108/certification/C7E7849466FE2358343588377258734B41C31549.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +wn4EGBYIACYWIQTH54SUZv4jWDQ1iDdyWHNLQcMVSQUCXzjyGgIbIAUJBd7uAAAK +CRByWHNLQcMVSeUGAP0WfArOzkxd4gHR4inXNCxZjvNSOlvMetR5knp8unMElQEA +8zwv/pcyva/OKoQ+fzUUokFAPbV7OcXmqLiInCvWTAw= +=O198 +-----END PGP SIGNATURE----- From 68dbb8014ae9527622a6fc134cdfaee2527b146f Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 11:40:52 +0200 Subject: [PATCH 6/7] Switch advertized key for dvzrv Switch advertized key from C7E7849466FE2358343588377258734B41C31549 to 991F6E3F0765CF6295888586139B09DA5BF0D338, as the latter superseded the former. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2537028..f409fc5 100644 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ Christian Hesse 02FD 1C7A 934E 6145 4584 9F19 A623 4074 498E 9CEE David Runge -C7E7 8494 66FE 2358 3435 8837 7258 734B 41C3 1549 +991F 6E3F 0765 CF62 9588 8586 139B 09DA 5BF0 D338 Pierre Schmitz 4AA4 767B BC9C 4B1D 18AE 28B7 7F2D 434B 9741 E8AC From 62646e219bf378e5aadbeaa16680fe463204608b Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 29 May 2023 13:16:17 +0200 Subject: [PATCH 7/7] Add revocation for dvzrv Add revocation certificate for C7E7849466FE2358343588377258734B41C31549. --- .../C7E7849466FE2358343588377258734B41C31549.asc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/revocation/C7E7849466FE2358343588377258734B41C31549.asc diff --git a/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/revocation/C7E7849466FE2358343588377258734B41C31549.asc b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/revocation/C7E7849466FE2358343588377258734B41C31549.asc new file mode 100644 index 0000000..1ffab9c --- /dev/null +++ b/keyring/packager/dvzrv/C7E7849466FE2358343588377258734B41C31549/revocation/C7E7849466FE2358343588377258734B41C31549.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +wngEIBYIACAWIQTH54SUZv4jWDQ1iDdyWHNLQcMVSQUCYnltNQIdAwAKCRByWHNL +QcMVSRBZAQCHwoMtoSpUEwy+MkP1waEE3k2WlwDXQoo/9FwzTFxz5wD9EXQtSlz5 +0nAUHeAVGH7aUuxlSsfC58+kJ0ZqwkEv3AA= +=pI72 +-----END PGP SIGNATURE-----