Attachment 140852 Details for Bug 93656 – suggested patch

[patch] suggested patch

138470.diff.txt (text/plain), 4.63 KB, created by Chris Lamb on 2018-07-27 12:00:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lamb

Created: 2018-07-27 12:00:46 UTC

Size: 4.63 KB

patch

obsolete

>From b6841250b63a01f99953654b019bf6c9363c7ab7 Mon Sep 17 00:00:00 2001
>From: Dwayne Litzenberger <dlitz@dlitz.net>
>Date: Sat, 31 Mar 2018 18:58:01 -0700
>Subject: [PATCH] Don't assume every *.key file is an Apple Keynote file
>
>https://bugs.freedesktop.org/show_bug.cgi?id=93656
>---
> freedesktop.org.xml.in |   3 ++-
> tests/list             |   3 +++
> tests/test-garbage.key | Bin 0 -> 259 bytes
> tests/test-secret.key  |  35 +++++++++++++++++++++++++++++++++++
> 4 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 tests/test-garbage.key
> create mode 100644 tests/test-secret.key
>
>diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
>index 72c41d6..ad20fee 100644
>--- a/freedesktop.org.xml.in
>+++ b/freedesktop.org.xml.in
>@@ -293,6 +293,7 @@ command to generate the output files.
>     <glob pattern="*.asc" weight="10"/>
>     <glob pattern="*.pgp"/>
>     <glob pattern="*.gpg"/>
>+    <glob pattern="*.key"/>
>   </mime-type>
>   <mime-type type="application/pgp-signature">
>     <_comment>detached OpenPGP signature</_comment>
>@@ -7027,7 +7028,7 @@ command to generate the output files.
>         <match type="string" value="index.apxl" offset="30"/>
>       </match>
>     </magic>
>-    <glob pattern="*.key"/>
>+    <glob pattern="*.key" weight="80"/>
>     <alias type="application/vnd.apple.keynote"/>
>   </mime-type>
> 
>diff --git a/tests/list b/tests/list
>index 269c50a..34b231d 100644
>--- a/tests/list
>+++ b/tests/list
>@@ -643,6 +643,9 @@ COPYING.asc application/pgp-signature xoo
> test-public-key.asc application/pgp-keys xoo
> test-secret-key.skr application/pgp-keys ooo
> test-secret-key.asc application/pgp-keys xoo
>+# not all *.key should be detected as Apple Keynote
>+test-secret.key application/pgp-keys x
>+test-garbage.key application/octet-stream x
> 
> # copied from https://bitbucket.org/scons/scons/raw/f0d4664d36f8a4d4da53178cf947c86c86db3cb7/SConstruct
> SConstruct text/x-scons oxo
>diff --git a/tests/test-garbage.key b/tests/test-garbage.key
>new file mode 100644
>index 0000000000000000000000000000000000000000..55f65c3aac3ad76d066f8e9d2929673518c024e3
>GIT binary patch
>literal 259
>zcmV+e0sQ_aA+ziPp~{;~u1RMK*j{0D+8cW>8A9f?ji}Hf-b$<XeV?a+26Kbcm^|J4
>zaw;iPuQPn`+TGGQ!j^0nYZv^|0>sNwpg;IT!<fh>us~?$IsE<auIrVhDmdlgxi$6@
>zTQ3vbY*eQLE+RCoybZ+r0@fkf0{6MxvdPA$lUDcFf+VFRXVH48rjR<%96QSYjW2C8
>z!Y=KNHeg2|wRt#;nlTRB&ozveHNWxd4|1nv_96iOn(_UI5EGJYr$`YnUVLibKU_<R
>zYt?>o6aJHiD5)TyorO$Mocg^KY{$b~g5!%bx(J2qqPGeif3Qp{7D%XXiljos>_<w$
>J<<`#PnrEGQguVa(
>
>literal 0
>HcmV?d00001
>
>diff --git a/tests/test-secret.key b/tests/test-secret.key
>new file mode 100644
>index 0000000..3d64502
>--- /dev/null
>+++ b/tests/test-secret.key
>@@ -0,0 +1,35 @@
>+-----BEGIN PGP PRIVATE KEY BLOCK-----
>+Version: GnuPG v1.4.12 (GNU/Linux)
>+
>+lQH9BFG4bv4BBADcXSfapilvuanHiRmWIY7sYm5TAf8yWvjdqOp1E8RO6Z5FPH6D
>+IeBruDaWVA5QEoMxF1oG7DXqliVWG1Y4Ki1sPHkST4J6B2j/w3u9kDhdHQQtRd1k
>+XQUz3b+rI7BvoEBNYW64t7rswyM8dh0MqNaCFfnf+PQ2yDL1ib5eMmnp0wARAQAB
>+/gMDAl/TqclmjUSrYMW3XdXp8iQ7JJBZcOfP1kz3rM/Kc3/8nzsH1sgTNG01jOT/
>+tJ4vBnIIA2naOLXUxPGcn9plS6iT30v3Z3ESmpMVwCYrBPXaNGcU87GQyEN6n71M
>+lHsGYJ8FijNv3Bafj5L1rP/tEMHwSDe7/Q3kXx5Cc5XbSw9+EhA9Ajp7/WaN4vNr
>+lfMXli1GeTasBa3IldFCNjO77aJJTBQ1Xp7tAFwDZo2gOOi/FTQk2xavHvLX9x+w
>+VBBvejn5kJVYFVtTPRpjKyrqxYHiCsQ7qlhRLNY7uQrGU/uGW2UJgCZsBANvJZZ4
>+MzxaWALZ94CES1NanKNmuE5eonuIVv8CKWmnBJBj3YWsQY2XzFgw9sJta2f88gIs
>+LNADorUl5NfxxnnJwh/94X/eLEs7ryh0/duppOSdCy6fRoyvLYkblVfg6h/uKnzZ
>+n2wMYXFVu57Gflr2xDIdgMcxrGIFOel+zXY9XZW1HV60IlRlc3QgS2V5IChUZXN0
>+KSA8dGVzdEBleGFtcGxlLm9yZz6IvgQTAQIAKAUCUbhu/gIbAwUJAAFRgAYLCQgH
>+AwIGFQgCCQoLBBYCAwECHgECF4AACgkQQkaUm9rcOLBWmAQAre90nAhQAeL8G2gw
>+ir0h0D+9GTs7czXEq1tw+eRrzYU4UU48CF8oozj79FZYwO/NcZYvEMBAbL/5AN68
>+ovAS1EuxFsxyp592nW6Wr8bv7kyCJQRnRWNIZj8sRIWQO+Sflg+apzQ2ldBfYr9G
>+WNP7+EfY5C7XrIIBFL3P1JSGT5udAf4EUbhu/gEEANMxh8rpABtK3pzNvKnh43f6
>+aMw4iZpYOMH0Uoo/pVsrOMbXs+iGB/zm9CUcDVnse3qwYzcaA4y4VKkTBy+wP50z
>+o9cgCOQIynI4G6qsvjkGW5fNSW6q2U/PWAqJ4+mFfzqnJ4zmKopPFruDR1TjMGhY
>+/NHOulTMFzzi5tF+8J8lABEBAAH+AwMCX9OpyWaNRKtgj1CMQ4unXWMwlCYMxbHp
>+6THL/4Zl3nruLT/esy2VJjip9VJbI+QYBdzJRJqr9EHCxT3yJrHX6T9h4xiZ0tcu
>+xikYNqBmXFkuEr2I4z1MYODnWAjEK970FsLcwlNaAeOMra7ul/RRnqVRdpjmwI4A
>+rNFF7jM8xDCeiN4kt/39PX9yFgmv2/r2rTbbpTYiIcc0AYr+YWf71eaYD+vrUdp4
>++ZiuPVhDQ+yiUv5xr4SZTGzVBAK7evLbUSsccO91iNI4EaUrWt31owRCLOCzyZEA
>+qJ3IQcmSenxC7FyAXPouawhaNtej7Y2Fmr8uD6ao95C4GHbitvjPryBpWu0YLZ5g
>+eUR4Q61pszdiXehc/9ftTApJwRloTI6HOOs04gw07I5u0IDyKH2vrM/N8R4pu0k+
>+dF79LAfetMIyPJqxVrXvjGgWvYzQIOp977o7z3qDlHsCIDM/UBsqD+S9dGDUIB4a
>+Ypl5q7GIpQQYAQIADwUCUbhu/gIbDAUJAAFRgAAKCRBCRpSb2tw4sD7rA/0e5EDv
>+NPrvZ2TyktgRJys2P76LMVxu56dANVgQFYyEE/0E+MI0FsD4HypvYGdiKLYqCq5y
>+hxRwqudHt6hNtL25dfJECkWSpl8hHpLOzferXb3+DABIR58NjJCuRxeUgO6mnJkS
>+2vbwFnQZdYqIMmwH+WaF+gkfDwAgQOHwGX+Htw==
>+=1xyV
>+-----END PGP PRIVATE KEY BLOCK-----
>-- 
>2.16.3
>

Actions: View | Splinter Review

Attachments on bug 93656: 138470 | 140852

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.