From 3786744d944fe983871123f9f89427b67be6a82a Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Thu, 15 Jun 2023 20:53:53 -0500 Subject: Qt UI: Update signing keys We rotated our keys in 2022 and need to use them. --- ui/qt5/horizonwizard.cc | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 5026316..524b70f 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -551,46 +551,33 @@ QString HorizonWizard::toHScript() { switch(arch) { case aarch64: lines << "arch aarch64"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/arm-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/arm-2@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/aarch64/aarch64-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/aarch64/aarch64-2@packages.adelielinux.org.pub"; break; case armv7: lines << "arch armv7"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/arm-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/arm-2@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/armv7/armv7-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/armv7/armv7-2@packages.adelielinux.org.pub"; break; case pmmx: lines << "arch pmmx"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86-2@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/pmmx/pmmx-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/pmmx/pmmx-2@packages.adelielinux.org.pub"; break; case ppc: lines << "arch ppc"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-2@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/ppc/ppc-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/ppc/ppc-2@packages.adelielinux.org.pub"; break; case ppc64: lines << "arch ppc64"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/powerpc-2@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/ppc64/ppc64-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/ppc64/ppc64-2@packages.adelielinux.org.pub"; break; case x86_64: lines << "arch x86_64"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86-1@packages.adelielinux.org.pub"; - lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86-2@packages.adelielinux.org.pub"; - break; - case mips64: - lines << "arch mips64"; - /* XXX: MIPS signing keys are needed before we ship anything. */ - break; - case mips: - lines << "arch mips"; - break; - case mips64el: - lines << "arch mips64el"; - break; - case mipsel: - lines << "arch mipsel"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86_64/x86_64-1@packages.adelielinux.org.pub"; + lines << "signingkey https://distfiles.adelielinux.org/adelie/keys/x86_64/x86_64-2@packages.adelielinux.org.pub"; break; case UnknownCPU: /* no arch line. hopefully it's run on the target. */ -- cgit v1.2.3-70-g09d2