diff options
author | Dwayne Litzenberger <dlitz@dlitz.net> | 2018-03-31 18:58:01 -0700 |
---|---|---|
committer | Chris Lamb <chris@chris-lamb.co.uk> | 2018-10-18 16:37:05 -0400 |
commit | 5d1c0a63d3de30e590711390323de4b2a49dfcfb (patch) | |
tree | 7df116086b54e53b2e8c40430f3399dd0fdc6d6a | |
parent | 512bd51a0cb5fb26bd65b4d2a98012d5a3d2bfc1 (diff) | |
download | shared-mime-info-5d1c0a63d3de30e590711390323de4b2a49dfcfb.tar.gz |
Don't assume every *.key file is an Apple Keynote file
https://bugs.freedesktop.org/show_bug.cgi?id=93656
-rw-r--r-- | freedesktop.org.xml.in | 3 | ||||
-rw-r--r-- | tests/list | 3 | ||||
-rw-r--r-- | tests/test-garbage.key | bin | 0 -> 259 bytes | |||
-rw-r--r-- | tests/test-secret.key | 35 |
4 files changed, 40 insertions, 1 deletions
diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in index 66c44fa2..e45ea209 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> @@ -7112,7 +7113,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> @@ -657,6 +657,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 Binary files differnew file mode 100644 index 00000000..55f65c3a --- /dev/null +++ b/tests/test-garbage.key diff --git a/tests/test-secret.key b/tests/test-secret.key new file mode 100644 index 00000000..3d64502b --- /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----- |