From ce9429ce51c6427c81be6db048769f1b777b3ac5 Mon Sep 17 00:00:00 2001 From: mickael e Date: Thu, 21 May 2020 09:08:27 -0400 Subject: [PATCH] Update signing key expiry date to 20210630 And increment securedrop-keyring version to 0.1.4 --- .../securedrop_application_server.yml | 2 +- .../group_vars/securedrop_monitor_server.yml | 2 +- .../files/fpf-signing-key.pub | 58 +++++++++--------- .../securedrop-keyring/DEBIAN/control | 2 +- .../apt/trusted.gpg.d/securedrop-keyring.gpg | Bin 3700 -> 4925 bytes molecule/builder-xenial/tests/vars.yml | 2 +- .../staging/common/test_fpf_apt_repo.py | 2 +- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/install_files/ansible-base/group_vars/securedrop_application_server.yml b/install_files/ansible-base/group_vars/securedrop_application_server.yml index a8c88fc764..c5a8ceec69 100644 --- a/install_files/ansible-base/group_vars/securedrop_application_server.yml +++ b/install_files/ansible-base/group_vars/securedrop_application_server.yml @@ -6,7 +6,7 @@ ip_info: ### Used by the install_local_deb_pkgs role ### local_deb_packages: - - "securedrop-keyring-0.1.3+{{ securedrop_app_code_version }}-amd64.deb" + - "securedrop-keyring-0.1.4+{{ securedrop_app_code_version }}-amd64.deb" - "securedrop-config-0.1.3+{{ securedrop_app_code_version }}-amd64.deb" - "securedrop-ossec-agent-3.6.0+{{ securedrop_app_code_version }}-amd64.deb" - "{{ securedrop_app_code_deb }}.deb" diff --git a/install_files/ansible-base/group_vars/securedrop_monitor_server.yml b/install_files/ansible-base/group_vars/securedrop_monitor_server.yml index acc26ec410..096e575971 100644 --- a/install_files/ansible-base/group_vars/securedrop_monitor_server.yml +++ b/install_files/ansible-base/group_vars/securedrop_monitor_server.yml @@ -6,7 +6,7 @@ ip_info: ### Used by the install_local_deb_pkgs role ### local_deb_packages: - - "securedrop-keyring-0.1.3+{{ securedrop_app_code_version }}-amd64.deb" + - "securedrop-keyring-0.1.4+{{ securedrop_app_code_version }}-amd64.deb" - "securedrop-config-0.1.3+{{ securedrop_app_code_version }}-amd64.deb" - "securedrop-ossec-server-3.6.0+{{ securedrop_app_code_version }}-amd64.deb" - ossec-server-3.6.0-amd64.deb diff --git a/install_files/ansible-base/roles/install-fpf-repo/files/fpf-signing-key.pub b/install_files/ansible-base/roles/install-fpf-repo/files/fpf-signing-key.pub index 1912a587f4..7c1f70d52d 100644 --- a/install_files/ansible-base/roles/install-fpf-repo/files/fpf-signing-key.pub +++ b/install_files/ansible-base/roles/install-fpf-repo/files/fpf-signing-key.pub @@ -11,33 +11,33 @@ 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 -cIYqWzBX7dw= -=ZsUE +tB5TZWN1cmVEcm9wIFJlbGVhc2UgU2lnbmluZyBLZXmJAlcEEwEKAEECGwMFCwkI +BwMFFQoJCAsFFgIDAQACHgECF4ACGQEWIQQiJFyB47rrQTizYGExD1YSAPStdwUC +XsZBhAUJCNOEJQAKCRAxD1YSAPStd+ovD/4+jLGlwlLmBpgvohrbiC7xCioVW+Ik +18j+uUSyYBNhvDOZugY+/Z6X99PHvjgjRbTle2NvAx5itdZfiooGSZ8cuiPRbDkQ +xpmZqOdkpN+5/B5dh/bd+P/K2Ggxqkyb80b+xoDviLh6OmIDPILTbz9ACkwu5jdH +0wo0UEt5C+GT8lvBmVXii6vGlTvsv86/yLShvBq6mEJ+7nazWMOShJy3bvyrJRMg +3dZfQSB6WlVCRO9EDBlvTW9Xedva7VDu6Up1BSD+enpXWRLTbqWvxmS7QQ2Usw58 +D7CCoJDA+8zL6UkJFrVxTiXQWbOvttkOA9++aJp4IbXsqTyrIkxNRjlKdyET9xbB +HGSgJhhgGUNVZNBxHVZFHvHurXDX0OyfWaYY9ET/EjqMCjUbWh0vh2c6/M3rDh+J +nH+tZUjJ9mM/AJ0hcORPVv3wbWdsfWq9r3t1Q7wlphal7RzgNqPymekj+1ndTs4y +jfsWgLmxYF8knP1+EipoL1Q7vm1JdO0VOb4IyhF+6VUTkjrDy6uHwXc3fMGHEAeU +nZvhVzZSx8h8HVsfnppM2RjNZKPwNQ43he8HllLqsRFsumg6gbBNRgrsVEBjRzxf +OKESJqxVZ5iHUvWPQPuGjuh83HiUxPN4yjZXUVNXv0Alevv1By3ALeVAmaQVw/KA +/sNu9p74VRggjrRFU2VjdXJlRHJvcCBSZWxlYXNlIFNpZ25pbmcgS2V5IDxzZWN1 +cmVkcm9wLXJlbGVhc2Uta2V5QGZyZWVkb20ucHJlc3M+iQJUBBMBCgA+AhsDBQsJ +CAcDBRUKCQgLBRYCAwEAAh4BAheAFiEEIiRcgeO660E4s2BhMQ9WEgD0rXcFAl7G +QZQFCQjThCUACgkQMQ9WEgD0rXcWVg/+JJT7J0ycCd2Rl7A2K4YQfJcf6TV05HDf +/sxc+JGs1hh/CFgR5Nt1TDPg7dQfCumQWI+e4A8NSFllIKGEajgxdAg/uszO9UQL +9iVtyNFY69/gfWeNVyOoioYxRSlaIyKUD2PINeHi5KYDe3dkh9aXDA/X4sB8k7Dt +mvDXqNX4/85P9M9JUjWahHqG3giYW9nyvvlMeV82K4BPPhwwqwbRRaIVNcdytDIi +LvXxOZf/TjX3xHbwTHYghclZZX3ZCiZ8OTD+yLkCqTJsT9GVfIlO/algc+7ezz7B +acsSuTa77/+8vy78dA5k9JM6rSZzfl/8T3LOmDLq+RE+DCUXx8ZJ+qnrr5aSruPB +BSlu7S/26NIAtB6LyKtSBpX39y66/9lYCaQWZDcNraq5PWInv0kQqXEc6C8Vi25q +BFE3a4Lt45bZMGCREYvLWXRxzH9rESVVekxZVZEjgmldh94OLRuXRvU8nlu2fq4G +YH0a+Oy/87LemKv7q2IZX6s7uTZg5xMBTaPqFsE/AGQWQfHvj1EWthcaeoIasfxE +lsWi9qHE4N+Jg/L+XC90S0kogDWGdyS+mKf0dE6jq4ioKf29zRJ4629id6VYHeib +i3df/KOdUeeth5X9ann6/KNncX7Us16rV4a6Tl1OLoV7xkwh2Hy8MfClDkTYeoHc +Y6V2vWAk0Rc= +=LOAb -----END PGP PUBLIC KEY BLOCK----- diff --git a/install_files/securedrop-keyring/DEBIAN/control b/install_files/securedrop-keyring/DEBIAN/control index c3365b0a24..bb2e3cab28 100644 --- a/install_files/securedrop-keyring/DEBIAN/control +++ b/install_files/securedrop-keyring/DEBIAN/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: SecureDrop Team Homepage: https://securedrop.org Package: securedrop-keyring -Version: 0.1.3+1.4.0~rc1 +Version: 0.1.4+1.4.0~rc1 Architecture: amd64 Depends: gnupg Description: Provides an apt keyring for SecureDrop-related packages, so the master signing key used for SecureDrop packages can be updated via apt. diff --git a/install_files/securedrop-keyring/etc/apt/trusted.gpg.d/securedrop-keyring.gpg b/install_files/securedrop-keyring/etc/apt/trusted.gpg.d/securedrop-keyring.gpg index a7867d3c113fcc72f4b0717f8b989087fc003899..8921305f605c86b43bdb51001707379846d553e1 100644 GIT binary patch delta 1126 zcmV-s1eyEv9K9y6vkl3#zBMy2?*1KB>)Nu5HSx{5&-nAcj_+> z{yvPcrNUC?2AD6R8rz62@d_#xTjC_w$o{!RvS1Toyfc})20s0sm-o}hzBnUAwB>ta zZv!4;wboyXiUvua9J(XXY&j6dnVG2PWTfA@{2pD0_TBjZ%GhWzs!W^nM*hZt?}&f6 zdOBhQJc842KR^mhF6K8!(+V_DOL+_7lk!`^nN{M8tHzZ(?7z;x$h4un8oHQ5e(rX& zSi_QpoVRZLt0fa4-PT`0AbMI=LPYOG3>j}tZ&!KS+U-#8=}L74ApUxKS6LF%Zl$lr zWV=BPl(PI*bZ68(JMNhi5wc&Fc;y ziJX6}Wk|{PV?O|$A#mhRR{ij8XKa0Hy{~(9L%b!X7NzYR;5MW3ndu|@S>1n5&N7Yr z7J#|2U|%Gh{eBWEXfISdzHLc#?G-t`2+9$D=~WYwI>XDWhrxF@e8Gnh2b7(g;a4_N z$H;sgTOXd9OxYOCWTWsk4mXAG2bNOmu@P*#XgYzgO-2grR6t`#JYP7W5+)Nu5HSx{5&-nAcNSI;{v?$9Crq3P-I15DHYrvE7=H*@5#-x-Of%r^)E^4zkXVnN;13N*S!E!hglaf3bO=AX%+B>h z3-%>#$kABq-{5^`jaMV6iiR;oDOw{Uln-ObHQ|5anuL0W-Uygm+48>mOnF~6D}YZv95AZ}(M6&aHOF$aG9oVZ@i~|O zPBr($cJNGgAce_UWqsKSCVV+C{>ZrksWNO&(Up9OPW`E1bMD^HKEY|r61g_J@Bh5N zF8qIV4rKI`I;|#ieqa1ga?Y4C>iH2q3?&!G#!33A>#vrQuH(T4DQ@jA_UO_8v>uDd zt5OD)_xCQk|Jhgxq!wg14XvuVJz^)nNf4=V9Oy3p~T?diG%X~TrYG>Nhp9dhIb^s zn5Xn~PNS=cs44xu%@TO)Z(?_)SRLq_i+5lAqn%Obt%sHUYI*wnqi1n`)U#fzSB56K sPF+qeg?q+KA=rGpG4Q1hMA&+P++(G7y