Add new SHA384 keys
This commit is contained in:
Родитель
f3e04b992a
Коммит
df58bf063c
|
@ -1,12 +1,15 @@
|
|||
#!/bin/bash
|
||||
# Get official mozilla keys
|
||||
set -e
|
||||
BASEURL="https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater"
|
||||
|
||||
SHA1_REV="58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2"
|
||||
SHA384_REV="92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5"
|
||||
|
||||
function get_key() {
|
||||
filename=$1
|
||||
name=$2
|
||||
url="$BASEURL/$filename"
|
||||
rev=${3-default}
|
||||
url="https://hg.mozilla.org/mozilla-central/raw-file/${rev}/toolkit/mozapps/update/updater/${filename}"
|
||||
echo "# From $url"
|
||||
echo -n "$name = b\"\"\""
|
||||
curl -s $url | openssl x509 -inform DER -pubkey -noout | head -c -1
|
||||
|
@ -18,17 +21,29 @@ echo "#"
|
|||
echo "# Automatically generated - do not edit!"
|
||||
echo "#"
|
||||
echo "# flake8: noqa"
|
||||
get_key "release_primary.der" "release1"
|
||||
get_key "release_primary.der" "release1_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "release_secondary.der" "release2"
|
||||
get_key "release_secondary.der" "release2_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "release_primary.der" "release1_sha1" $SHA1_REV
|
||||
echo
|
||||
get_key "release_secondary.der" "release2_sha1" $SHA1_REV
|
||||
echo
|
||||
|
||||
get_key "nightly_aurora_level3_primary.der" "nightly1"
|
||||
get_key "nightly_aurora_level3_primary.der" "nightly1_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "nightly_aurora_level3_secondary.der" "nightly2"
|
||||
get_key "nightly_aurora_level3_secondary.der" "nightly2_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "nightly_aurora_level3_primary.der" "nightly1_sha1" $SHA1_REV
|
||||
echo
|
||||
get_key "nightly_aurora_level3_secondary.der" "nightly2_sha1" $SHA1_REV
|
||||
echo
|
||||
|
||||
get_key "dep1.der" "dep1"
|
||||
get_key "dep1.der" "dep1_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "dep2.der" "dep2"
|
||||
get_key "dep2.der" "dep2_sha384" $SHA384_REV
|
||||
echo
|
||||
get_key "dep1.der" "dep1_sha1" $SHA1_REV
|
||||
echo
|
||||
get_key "dep2.der" "dep2_sha1" $SHA1_REV
|
||||
) > src/mardor/mozilla.py
|
||||
|
|
|
@ -71,30 +71,35 @@ def do_extract(marfile, destdir, decompress):
|
|||
m.extract(str(destdir), decompress=decompress)
|
||||
|
||||
|
||||
def do_verify(marfile, keyfiles):
|
||||
"""Verify the MAR file."""
|
||||
def get_keys(keyfiles, signature_type):
|
||||
builtin_keys = {
|
||||
('release', 'sha1'): [mardor.mozilla.release1_sha1, mardor.mozilla.release2_sha1],
|
||||
('release', 'sha384'): [mardor.mozilla.release1_sha384, mardor.mozilla.release2_sha384],
|
||||
('nightly', 'sha1'): [mardor.mozilla.nightly1_sha1, mardor.mozilla.nightly2_sha1],
|
||||
('nightly', 'sha384'): [mardor.mozilla.nightly1_sha384, mardor.mozilla.nightly2_sha384],
|
||||
('dep', 'sha1'): [mardor.mozilla.dep1_sha1, mardor.mozilla.dep2_sha1],
|
||||
('dep', 'sha384'): [mardor.mozilla.dep1_sha384, mardor.mozilla.dep2_sha384],
|
||||
}
|
||||
keys = []
|
||||
for keyfile in keyfiles:
|
||||
if keyfile.startswith(':mozilla-'):
|
||||
name = keyfile.split(':mozilla-')[1]
|
||||
if name == 'release':
|
||||
keys.append(mardor.mozilla.release1)
|
||||
keys.append(mardor.mozilla.release2)
|
||||
elif name == 'nightly':
|
||||
keys.append(mardor.mozilla.nightly1)
|
||||
keys.append(mardor.mozilla.nightly2)
|
||||
elif name == 'dep':
|
||||
keys.append(mardor.mozilla.dep1)
|
||||
keys.append(mardor.mozilla.dep2)
|
||||
else:
|
||||
try:
|
||||
keys.extend(builtin_keys[name, signature_type])
|
||||
except KeyError:
|
||||
raise ValueError('Invalid internal key name: {}'
|
||||
.format(keyfile))
|
||||
else:
|
||||
key = open(keyfile, 'rb').read()
|
||||
keys.append(key)
|
||||
return keys
|
||||
|
||||
|
||||
def do_verify(marfile, keyfiles):
|
||||
"""Verify the MAR file."""
|
||||
with open(marfile, 'rb') as f:
|
||||
with MarReader(f) as m:
|
||||
keys = get_keys(keyfiles, m.signature_type)
|
||||
return any(m.verify(key) for key in keys)
|
||||
|
||||
|
||||
|
|
|
@ -2,8 +2,40 @@
|
|||
# Automatically generated - do not edit!
|
||||
#
|
||||
# flake8: noqa
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/release_primary.der
|
||||
release1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/release_primary.der
|
||||
release1_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxCHbY+fP3dvaP9XVbmK6
|
||||
i4rbqo72INEWgDSYbr/DIYfCSzHC9H8pU8dyjt+Nd8OtoUZtBD1N9fP7SlrvPZSI
|
||||
ZSW4k0e9Ky5aV3Uy+ivamSvYszkhqdeP2y7MBu73XHKYONR9PnKa+ovmREwSEI+h
|
||||
1e0ebm8zvF7Ndwx0mOeZkDu9SDkDGg4aj2xrJyBBOuGVjuctMZ6l1davANI5xiJ0
|
||||
GBEU3tR1gJs1T4vLBis5mEFn9y4kgyw/HrxmRYGnZL4fLb2fTI+pNW0Twu3KWwwi
|
||||
LgLkkVrNWiHSk7YWqxjcg5IA3pQETQ17paTHoB5Mnkvuh6MkDXvRG5VgAHZAigr6
|
||||
fJMsasOUaBeos/cD1LDQEIObpetlxc0Fiu/lvUts0755otkhI+yv35+wUa6GJrsE
|
||||
CsT7c/LaFtQXg06aGXbMLDn0bE/e+nw9KWT/rE1iYXMFkzrqoTeYJ+v7/fD/ywU8
|
||||
m8l4CZmXxzd/RogMrM3xl+j4ucAAltDQyL4yLySaIT05w5U8z2zJDEXFvpFDSRfF
|
||||
K3kjLwGub7wNwaQDuh/msIUdavu4g+GNikCXAJ8AssLuYatyHoltd2tf+EIIDW3U
|
||||
zzLpymnLo3cAz3IPfXyqVB+mcLcpqbHjl3hWms6l1wGtz6S4WqdrWs/KfzS5EyDK
|
||||
r63xn1Rg/XFmR57EsFEXAZ8CAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/release_secondary.der
|
||||
release2_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvki6CZE2td7jAtx/+51m
|
||||
V7w+/xA16HegUXVaesBC/00jG6aAMRo7fczXolCzhMatBeTWrweXsiJ9UhwMhanj
|
||||
V9uZ1Nj6ITBDtG7WB9ottf+GOpu8/V4PwwFWl4zQ5rjSvnZLGpLPY2KIN0wxArba
|
||||
Aqz8XsP3WePY7RL+7mG1CX/HEXSDzWMN+OIjZTmd5Z7pkRpUIoRSlGu4bR7J9D31
|
||||
xCEBnZqP4p8nCqOJZHUk0O5B93z9WprMggQ/BLW4AidAIgBLeSXmGRh4p+kVlYmb
|
||||
KkMDn+/h/iuP4rhnG1+kk7thnQIGwaqa/MDqijpPtlkQTKPcbrw4MthiWgo2Ag0U
|
||||
uNS2HqH1TCQMq/lslTgiEaJ1xYTE8xA9lYPS6nFzQpvmDOaaXMg7O6rdnDoCOKMi
|
||||
pkb27RRlnZe8VV5OTF/e5yw6chEF7dSGfSv4HIMf6wKIWAznacmNCVDbwESrfOdG
|
||||
VWWjT9Qvv92v/hnoVHdhYJ9sZKI5xVzM0bNZy25cQACFFFMMSfsutM5D8apqmOpm
|
||||
OZF/aoKQeSAmE+HKAXt785x+buHjlYjqE1SmqG2GUOmvaFV8NeWvUOoeA8jtGEC+
|
||||
qJ/32l7KXHVoVYje7hncEzxzR1VVURArga5PWIVnSEQoturNKNBPQ3pso6S/YmWO
|
||||
V64NQxJ6oJ7swf3MkDa1enkCAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/release_primary.der
|
||||
release1_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvH4r94FpQ0gvr1hhTfV9
|
||||
NUeWPJ5CN6TZRq7v/Dc4nkJ1J4IP1B3UEii34tcNKpy1nKupiZuTT6T1zQYT+z5x
|
||||
3UkDF9qQboQ8RNb/BEz/cN3on/LTEnZ7YSraRL11M6cEB8mvmJxddCEquwqccRbs
|
||||
|
@ -13,8 +45,8 @@ K9cnHxq4M/I4SUWTWO3r7yweQiHG4Jyoc7sP1jkwjBkSG93sDEycfwOdOoZft3wN
|
|||
sQIDAQAB
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/release_secondary.der
|
||||
release2 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/release_secondary.der
|
||||
release2_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq65HLYYaIvB/snHd7Oto
|
||||
CFGCiV7mx6VMJb+25ZeFIQk7y5fsPDlgLG/V7a84hGVROp8C2gAHxOXXJlk0v/n6
|
||||
dtruT0GxdLw4mUKB1uiPHLXV46k9ar/6QVgPRMWoJeeh3SVB2JyCtC+uqFca/N4D
|
||||
|
@ -24,8 +56,40 @@ fciTekyH9fav66rj7erU/lcnoFJLKrf2Wpu04R0na7q5TACjJx8yYta6fbwCQU01
|
|||
uwIDAQAB
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
|
||||
nightly1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
|
||||
nightly1_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAth151NGY8PBzn0bii9Yc
|
||||
AjYHZDwP9Lj1c3owG0zLqW2kPcdp86QTAcoYunHGYFFakNG3tooZhzwkMjZ1OrXc
|
||||
ERjD6AuVSGIBdsKtKP4vLtMjDUteFN4K2+rveozcnYFZuTWEajGu8uoYsv4QgdEA
|
||||
nTBC39j0J33xlfUR+XKuxzhxNrFX+fRFWuLDJrPziMcVA/mzf0gXlhtEsfV0HYyg
|
||||
yWpHdIWww+llysD1QOQAHk94Ss8c/4BFXFxlwlLeNlB1ZqLm1LsNy0jUy9EHeO3C
|
||||
H6eqmiFEbpdjlrkJdgR1NcTzeY/Qf/nhWH6BAZrSapQycF7OSLU+rFWMQUElSPLc
|
||||
NVl7oNAAfSYLTvRjPGi+mJK3wGFQw1EpwQl+elE1oj4+sHvIVpDrLb6btpxfr1cZ
|
||||
pR4Di/hkOIymxEDWvtUhOxUXnYbDKQSDcAHKM/xR3sdIAiVtVuL4hyBwlAqkQc2j
|
||||
H+SmnCbazgnq5+dN4y5DjoOgbZQ/koE3s3bUzzMeIxaul9v4gMtGROw3PQ3OZcP0
|
||||
lgjPRhY+NeTnWMo2nGb4/eS6Cn2qFLfbEQjsj6pJJBNKfvK/gm1jXb3PgXXdf8+d
|
||||
2xTPOX8QNpSK7C0w4vYlvSpYZlsx2cznEOV6LDqP0QHUnmd/k1xWRRGiQ7gtT+BV
|
||||
Fn0h7JyTGmEdFu6l4OhS8hMCAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
|
||||
nightly2_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzxgPvz/iBTM1s8pPOYpF
|
||||
Vfd/B1IGoNOwhh0zezL2QZHDqYZSLG3DMLQIQr3iEGwJq2wwRnOlZm5MqPfVKpif
|
||||
68iSMwcNW83xgPJLKm2D/8z4RlhM3UUcq0ZOZFARC+mi4OYNmQg8BRRoCORvDpSR
|
||||
DkZSujbR+nqnYg2bmWidt3KmHEpAne8/2jqNXw34tTERmCaIDU1XD6/M8vhalRXF
|
||||
9Q4iFWoynoJ88gWdVOu2cfpAsnM/xmD5Zav6RKtGJlJtnpbQUPd5euXdfveT6tsj
|
||||
kXjsk50L/WbBmr30it7mLwjzxhVlJ+zNWRJMUTipdNL+y+C4QY3e6MDNkIjKXjT7
|
||||
MkTCHdDeYkFveRJ23eZ3FIcxATHqrUKnVQt3i3801V6zihaL8WmEf+H92K7/pvFV
|
||||
HopZewG6jBU+AvCg4g/XJEbxYsKnuauL/56vkdsvhYkDKgJunjXA9jiCmNFeeeod
|
||||
EOE0Ii6f2f3+3Q1quMMz1GnI5tt9qZsFwDfI989v4viWmLfXCCcVmZFnNszUDEHb
|
||||
7uzbR1dQZtcHFBghsmiEdOS2Lc8jK3EW1liFPb+qq45Xh2vyJ5iLYIJnZqX2wQjq
|
||||
zQo5Nr4g/hA1Se+bzZNs3JalT0UT1gQ4M71NAIrtjI/+tfnKLb4VJ6yC7GG6PwFI
|
||||
hd/nHIowE+9e2+ry/tfDpFcCAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der
|
||||
nightly1_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4j/IS3gWbyVVnWn4ZRnC
|
||||
Fuzb6VAaHa0I+4E504ekhVAhbKlSfBstkLbXajdjUVAJpn02zWnOaTl5KAdpDpIp
|
||||
SkdA4mK20ej3/Ij7gIt8IwaX+ArXL8mP84pxDn5BgaNADm3206Z6YQzc/TDYu529
|
||||
|
@ -35,8 +99,8 @@ VclIXBDgbWPYtojexIJkmYj8JIIRsh3eCsrRRe14fq7cBurp3CxBYMlDHf0RUoaq
|
|||
hQIDAQAB
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
|
||||
nightly2 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
|
||||
nightly2_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7jCVFImsVY7ILLBHsqnL
|
||||
sxkXqkFvT9pnlCKITKL1DuUe1C5dl2wxnUBLngufRNcfiInPSfhl07rEcmMJxsW3
|
||||
2o7GxR5rqtZfGjBXerIRY36H1igXgODs+MuDuOBVe+ZJOwgGYoQoKP7THrtk/xr6
|
||||
|
@ -46,8 +110,40 @@ uJkvMZOHEuJwWT8ywfaXx/CN/jVt2OF+hCd20RVe08T5V6SjTM/QBgUtlRpQv2+e
|
|||
MwIDAQAB
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/dep1.der
|
||||
dep1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/dep1.der
|
||||
dep1_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8Y6AS+xwKoXZl0X5qOKr
|
||||
0I00xC4UN+IMjA1LIQoZ2GBkiqQF3q8v2nWTFE0+47+3NtP0l8tvsQY+LSYR4Fek
|
||||
v2Vx4m/CAMKmWzW6Vtlj80y6rQ04V19l41bZXvCIBW5fm9sAvPgc7CngkcLySNqk
|
||||
8vf57cUEpOmbsjSOCmK0j8hh03I1eWogpbAVEchSm1xN2sUJaVTvz5j8BfE6Vm0i
|
||||
nN7V0zF+AOxzvntZIpfUqMZbHRiMkGn4l9rjia1Rz0qUc9RNCJkNocyKtQ2N2wnN
|
||||
FjHpmK9x2V71cS1JQGhgLegrswPCAWY1lTmiLk9LweqGoVL0rqR4LCkb0VCaeSRe
|
||||
6bUEYcU1ZQedE80zGKB3AfoC5br1shYY0xjmyRSCQ8m8WE60HzXhL8wczKrn5yoJ
|
||||
iF6BxFwcYsvrWBPgIYVZLcqjODfR/M62o8yIfTC7yBcIdycJ0sWhB47dHAFxv1kc
|
||||
wv8Ik9ftvDyupE8kwcl58fNOXz93j7IxMry/ey27NyYpESPOUNcjT8TP26FdGebg
|
||||
4iJx0/LaYmaNUdchfBBlaYqGdH6ZGK0OeVxzHstGuG0gebm/igYcpaFxiQzvWijX
|
||||
MIAU56s4g+yj7pSzT5/s9r8Gv+YhsNHKm4hnwLZaITV0lLMT5h/OZGseQTPMBnAR
|
||||
hK3CIfcqG0I23hdwI29ZuUMCAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/92f6879a8f9fc7e727d7c281c9fa9f538cb96cb5/toolkit/mozapps/update/updater/dep2.der
|
||||
dep2_sha384 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzR/PTXo4ZUIV3p2mBwOy
|
||||
1qEemi4ZW84TqO0W5ws5ENuYvKGusYETvSS/WnUEzI3J7aQOzAtCIuxEsaGZTXdX
|
||||
Y5/oxcepKGzfSr7T8Wegklr0WIgi0Lili0n0DYRh4Aw7OUJy73N6gBS0QM0GYB0s
|
||||
cJX/Ofr6nOXSxT5KWJO5joI8a9Fr4kpQK8gj0jiXhtGbZSkaGKoVzdzz7dua/jSj
|
||||
HXM6EHjAO5PzJh9LDHqM5KiCUAKRVS3mz4jty/Qt1U4+qYmb8mu/ADWtyz/VV3VG
|
||||
dbffLsSTVz3NSJD5lW8QxwXhFSCP4lHxKwFYl5CjIEhKRwoWV8JG0HjgNivPBYLX
|
||||
A7m9lEwFden0mXayyHjgn3gBjYBUF7hfBjRi45DrPyayz6/1ZcdQlAuVoGWmPQZ9
|
||||
gf0xUFnt7JadMdG74K87sPxJSGOtcOCfst9KozGP8451VzkSoOY712GcCfxzsAwP
|
||||
NveKEfAVG8ayUiRFlFvNSQ13YlRltRwf0Gto2tJcgTWGKQLapi6Z6R55WquQyiaV
|
||||
UbwNIJmNldl555LFw+dSeCugbFMnE92NWeRdU1iYkGUt8H1llW7R3vt8y4h77eXF
|
||||
bpjl2nk6199VyCiHf9olnC5rBqLvf+xqduC0UJ+jWgxeFvbBcRJHEF0rA2XNNZPJ
|
||||
RPlEUn3O+exsA1gHlcddQY0CAwEAAQ==
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/dep1.der
|
||||
dep1_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjHSobdeiQ3JHP/cCIOp
|
||||
WaX9y12rL5mIo9OR9bpqEZdD0yXJJJeZA887Mv8slqsM+qObMUpKvfEE6zyYPIZJ
|
||||
ANib31neI5BBYHhfhf2f5EnkilSYlmU3Gx+uRsmsdt58PpYe124tOAGgca/8bUy3
|
||||
|
@ -57,8 +153,8 @@ Gm3H0TQcRzIEBzvPcIjiZi1nQj/r/3TlYRNCjuYT/HsNLXrB/U5Tc990jjAUJxdH
|
|||
0wIDAQAB
|
||||
-----END PUBLIC KEY-----"""
|
||||
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/tip/toolkit/mozapps/update/updater/dep2.der
|
||||
dep2 = b"""-----BEGIN PUBLIC KEY-----
|
||||
# From https://hg.mozilla.org/mozilla-central/raw-file/58402b43c9e1e22d8a9976ee9a7e4ffeee1bbbf2/toolkit/mozapps/update/updater/dep2.der
|
||||
dep2_sha1 = b"""-----BEGIN PUBLIC KEY-----
|
||||
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1WIFPTzP2Q4c5/8o1w/L
|
||||
oth5BE6pc7RlqxLC5vDIIoMHyLIYw7FJsaqnYEebBKjm2ZXqV7/94ILJEc+wgwqs
|
||||
1hKx7qSonAZ1IEiDpaGwvbxIP/gTXKcHX0VOnXImy7vN2r++N0aJhn46gOfZ9cys
|
||||
|
|
|
@ -49,7 +49,7 @@ def test_verify(tmpdir):
|
|||
cli.do_verify(TEST_MAR, [':mozilla-foo'])
|
||||
|
||||
keyfile = tmpdir.join('release.pem')
|
||||
keyfile.write(mozilla.release1)
|
||||
keyfile.write(mozilla.release1_sha1)
|
||||
assert cli.do_verify(TEST_MAR, [str(keyfile)])
|
||||
|
||||
|
||||
|
|
|
@ -1,15 +1,21 @@
|
|||
import os
|
||||
|
||||
from mardor.mozilla import dep1
|
||||
from mardor.mozilla import dep2
|
||||
from mardor.mozilla import nightly1
|
||||
from mardor.mozilla import nightly2
|
||||
from mardor.mozilla import release1
|
||||
from mardor.mozilla import release2
|
||||
from mardor.mozilla import dep1_sha1
|
||||
from mardor.mozilla import dep1_sha384
|
||||
from mardor.mozilla import dep2_sha1
|
||||
from mardor.mozilla import dep2_sha384
|
||||
from mardor.mozilla import nightly1_sha1
|
||||
from mardor.mozilla import nightly1_sha384
|
||||
from mardor.mozilla import nightly2_sha1
|
||||
from mardor.mozilla import nightly2_sha384
|
||||
from mardor.mozilla import release1_sha1
|
||||
from mardor.mozilla import release1_sha384
|
||||
from mardor.mozilla import release2_sha1
|
||||
from mardor.mozilla import release2_sha384
|
||||
from mardor.reader import MarReader
|
||||
|
||||
|
||||
def test_testmar_sig_bz2():
|
||||
TEST_MAR = os.path.join(os.path.dirname(__file__), 'test-bz2.mar')
|
||||
with MarReader(open(TEST_MAR, 'rb')) as m:
|
||||
assert m.verify(release1)
|
||||
assert m.verify(release1_sha1)
|
||||
|
|
Загрузка…
Ссылка в новой задаче