101 changed files with 74 additions and 20 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,36 @@
-SOURCES/DJM-GPG-KEY.gpg
-SOURCES/openssh-8.0p1.tar.gz
-SOURCES/pam_ssh_agent_auth-0.10.3.tar.bz2
+openssh-5.5p1-noacss.tar.bz2
+pam_ssh_agent_auth-0.9.2.tar.bz2
+/openssh-5.6p1-noacss.tar.bz2
+/pam_ssh_agent_auth-0.9.2.tar.bz2
+/openssh-5.8p1-noacss.tar.bz2
+/openssh-5.8p2-noacss.tar.bz2
+/openssh-5.9p1-noacss.tar.bz2
+/pam_ssh_agent_auth-0.9.3.tar.bz2
+/openssh-6.0p1-noacss.tar.bz2
+/openssh-6.1p1-noacss.tar.bz2
+/openssh-6.2p1.tar.gz
+/openssh-6.2p2.tar.gz
+/openssh-6.3p1.tar.gz
+/openssh-6.4p1.tar.gz
+/openssh-6.6p1.tar.gz
+/openssh-6.7p1.tar.gz
+/openssh-6.8p1.tar.gz
+/openssh-6.9p1.tar.gz
+/openssh-7.0p1.tar.gz
+/openssh-7.1p1.tar.gz
+/openssh-7.1p2.tar.gz
+/pam_ssh_agent_auth-0.10.2.tar.bz2
+/openssh-7.2p1.tar.gz
+/openssh-7.2p2.tar.gz
+/openssh-7.3p1.tar.gz
+/openssh-7.4p1.tar.gz
+/pam_ssh_agent_auth-0.10.3.tar.bz2
+/openssh-7.5p1.tar.gz
+/openssh-7.6p1.tar.gz
+/openssh-7.7p1.tar.gz
+/openssh-7.7p1.tar.gz.asc
+/DJM-GPG-KEY.gpg
+/openssh-7.8p1.tar.gz
+/openssh-7.8p1.tar.gz.asc
+/openssh-8.0p1.tar.gz
+/openssh-8.0p1.tar.gz.asc
--- a/.openssh.metadata
+++ b/.openssh.metadata
@ -1,3 +0,0 @@
-bed7240bb17840b451b8f8457791c33456814d93 SOURCES/DJM-GPG-KEY.gpg
-756dbb99193f9541c9206a667eaa27b0fa184a4f SOURCES/openssh-8.0p1.tar.gz
-a4482a050fdad1d012427e45799564136708cf6b SOURCES/pam_ssh_agent_auth-0.10.3.tar.bz2
--- a/SOURCES/openssh-8.0p1.tar.gz.asc
+++ b/SOURCES/openssh-8.0p1.tar.gz.asc
@ -1,14 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQHDBAABCgAdFiEEWcIRjtIG2SfmZ+vj0+X1a22SDTAFAly3ro8ACgkQ0+X1a22S
-DTCAiAx/W9XHoDs5NijyNIP43W2nFYuf6HG1duoLjdJ8rnsC3e90gx8h5RpUUh24
-JDACoUFnbJsNgiQBaYpO7bOnf3Vw5Oui1gPeKnQ76KQsXDwD/N/0wLUf55+XdNJ6
-tcgm6/x1W4b8bWje5bcS3qhxv6t/hSL/OxusA8zoNmnTD5XMg6QtJ0Rp9ZHPriCJ
-C4eCPdHfmyHCr1IATMX9+n5CO5JUPexaDjQug7k/Z1XA/UlwVfRRs1JMpviBodC+
-ZUOuk9tH11RKSBcUeR3Ef4iaR3FchryyyBZUZdYBkmDrnHrYpUK5ifdHT+ZXdzPl
-laX03Kz094LqrP6L3lafk6b1PKOVjKwx1vM5fhnv+pfx4dmao9BwZMuIq6Fa5uMX
-w2oHGhlIDmeT66Yny5d0APn2wCewyYUGPanSZY/HolHAPs+doOBgI361kMAR9J3e
-Ii3VKhIdE8i4K3fC19uDkf7xL8UVvRVXjgM7i+GNndh1ou/vDYxmEAsW9IR/D3XC
-HM/jMdq+UewAiRG46aI5rsi/A8J8/A==
-=YtoH
-----END PGP SIGNATURE-----
--- a/ci.fmf
+++ b/ci.fmf
@ -0,0 +1 @@
+resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,9 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-enabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-enabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-disabled-buildroot-disabled.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/fips-enabled-buildroot-disabled.functional}
--- a/SOURCES/openssh-4.3p2-askpass-grab-info.patch
+++ b/SOURCES/openssh-4.3p2-askpass-grab-info.patch
--- a/SOURCES/openssh-5.1p1-askpass-progress.patch
+++ b/SOURCES/openssh-5.1p1-askpass-progress.patch
--- a/SOURCES/openssh-5.8p2-sigpipe.patch
+++ b/SOURCES/openssh-5.8p2-sigpipe.patch
--- a/SOURCES/openssh-5.9p1-ipv6man.patch
+++ b/SOURCES/openssh-5.9p1-ipv6man.patch
--- a/SOURCES/openssh-6.3p1-ctr-evp-fast.patch
+++ b/SOURCES/openssh-6.3p1-ctr-evp-fast.patch
--- a/SOURCES/openssh-6.4p1-fromto-remote.patch
+++ b/SOURCES/openssh-6.4p1-fromto-remote.patch
--- a/SOURCES/openssh-6.6.1p1-log-in-chroot.patch
+++ b/SOURCES/openssh-6.6.1p1-log-in-chroot.patch
--- a/SOURCES/openssh-6.6.1p1-scp-non-existing-directory.patch
+++ b/SOURCES/openssh-6.6.1p1-scp-non-existing-directory.patch
--- a/SOURCES/openssh-6.6.1p1-selinux-contexts.patch
+++ b/SOURCES/openssh-6.6.1p1-selinux-contexts.patch
--- a/SOURCES/openssh-6.6p1-GSSAPIEnablek5users.patch
+++ b/SOURCES/openssh-6.6p1-GSSAPIEnablek5users.patch
--- a/SOURCES/openssh-6.6p1-allow-ip-opts.patch
+++ b/SOURCES/openssh-6.6p1-allow-ip-opts.patch
--- a/SOURCES/openssh-6.6p1-ctr-cavstest.patch
+++ b/SOURCES/openssh-6.6p1-ctr-cavstest.patch
--- a/SOURCES/openssh-6.6p1-force_krb.patch
+++ b/SOURCES/openssh-6.6p1-force_krb.patch
--- a/SOURCES/openssh-6.6p1-keycat.patch
+++ b/SOURCES/openssh-6.6p1-keycat.patch
--- a/SOURCES/openssh-6.6p1-keyperm.patch
+++ b/SOURCES/openssh-6.6p1-keyperm.patch
--- a/SOURCES/openssh-6.6p1-kuserok.patch
+++ b/SOURCES/openssh-6.6p1-kuserok.patch
--- a/SOURCES/openssh-6.6p1-privsep-selinux.patch
+++ b/SOURCES/openssh-6.6p1-privsep-selinux.patch
--- a/SOURCES/openssh-6.7p1-coverity.patch
+++ b/SOURCES/openssh-6.7p1-coverity.patch
--- a/SOURCES/openssh-6.7p1-kdf-cavs.patch
+++ b/SOURCES/openssh-6.7p1-kdf-cavs.patch
--- a/SOURCES/openssh-6.7p1-ldap.patch
+++ b/SOURCES/openssh-6.7p1-ldap.patch
--- a/SOURCES/openssh-6.7p1-sftp-force-permission.patch
+++ b/SOURCES/openssh-6.7p1-sftp-force-permission.patch
--- a/SOURCES/openssh-6.8p1-sshdT-output.patch
+++ b/SOURCES/openssh-6.8p1-sshdT-output.patch
--- a/SOURCES/openssh-6.9p1-permit-root-login.patch
+++ b/SOURCES/openssh-6.9p1-permit-root-login.patch
--- a/SOURCES/openssh-7.1p2-audit-race-condition.patch
+++ b/SOURCES/openssh-7.1p2-audit-race-condition.patch
--- a/SOURCES/openssh-7.2p2-k5login_directory.patch
+++ b/SOURCES/openssh-7.2p2-k5login_directory.patch
--- a/SOURCES/openssh-7.2p2-s390-closefrom.patch
+++ b/SOURCES/openssh-7.2p2-s390-closefrom.patch
--- a/SOURCES/openssh-7.2p2-x11.patch
+++ b/SOURCES/openssh-7.2p2-x11.patch
--- a/SOURCES/openssh-7.3p1-x11-max-displays.patch
+++ b/SOURCES/openssh-7.3p1-x11-max-displays.patch
--- a/SOURCES/openssh-7.4p1-systemd.patch
+++ b/SOURCES/openssh-7.4p1-systemd.patch
--- a/SOURCES/openssh-7.5p1-sandbox.patch
+++ b/SOURCES/openssh-7.5p1-sandbox.patch
--- a/SOURCES/openssh-7.6p1-audit.patch
+++ b/SOURCES/openssh-7.6p1-audit.patch
--- a/SOURCES/openssh-7.6p1-cleanup-selinux.patch
+++ b/SOURCES/openssh-7.6p1-cleanup-selinux.patch
--- a/SOURCES/openssh-7.7p1-fips.patch
+++ b/SOURCES/openssh-7.7p1-fips.patch
--- a/SOURCES/openssh-7.7p1-gssapi-new-unique.patch
+++ b/SOURCES/openssh-7.7p1-gssapi-new-unique.patch
--- a/SOURCES/openssh-7.7p1-redhat.patch
+++ b/SOURCES/openssh-7.7p1-redhat.patch
--- a/SOURCES/openssh-7.8p1-UsePAM-warning.patch
+++ b/SOURCES/openssh-7.8p1-UsePAM-warning.patch
--- a/SOURCES/openssh-7.8p1-role-mls.patch
+++ b/SOURCES/openssh-7.8p1-role-mls.patch
--- a/SOURCES/openssh-7.8p1-scp-ipv6.patch
+++ b/SOURCES/openssh-7.8p1-scp-ipv6.patch
--- a/SOURCES/openssh-7.9p1-ssh-copy-id.patch
+++ b/SOURCES/openssh-7.9p1-ssh-copy-id.patch
--- a/SOURCES/openssh-8.0p1-avoidkillall.patch
+++ b/SOURCES/openssh-8.0p1-avoidkillall.patch
--- a/SOURCES/openssh-8.0p1-bigsshdconfig.patch
+++ b/SOURCES/openssh-8.0p1-bigsshdconfig.patch
--- a/SOURCES/openssh-8.0p1-channel-limits.patch
+++ b/SOURCES/openssh-8.0p1-channel-limits.patch
--- a/SOURCES/openssh-8.0p1-client_alive_count_max.patch
+++ b/SOURCES/openssh-8.0p1-client_alive_count_max.patch
--- a/SOURCES/openssh-8.0p1-crypto-policies.patch
+++ b/SOURCES/openssh-8.0p1-crypto-policies.patch
--- a/SOURCES/openssh-8.0p1-crypto-policy-doc.patch
+++ b/SOURCES/openssh-8.0p1-crypto-policy-doc.patch
--- a/SOURCES/openssh-8.0p1-cve-2020-14145.patch
+++ b/SOURCES/openssh-8.0p1-cve-2020-14145.patch
--- a/SOURCES/openssh-8.0p1-entropy.patch
+++ b/SOURCES/openssh-8.0p1-entropy.patch
--- a/SOURCES/openssh-8.0p1-gssapi-keyex.patch
+++ b/SOURCES/openssh-8.0p1-gssapi-keyex.patch
--- a/SOURCES/openssh-8.0p1-ipv6-process.patch
+++ b/SOURCES/openssh-8.0p1-ipv6-process.patch
--- a/SOURCES/openssh-8.0p1-keygen-sha2.patch
+++ b/SOURCES/openssh-8.0p1-keygen-sha2.patch
--- a/SOURCES/openssh-8.0p1-keygen-strip-doseol.patch
+++ b/SOURCES/openssh-8.0p1-keygen-strip-doseol.patch
--- a/SOURCES/openssh-8.0p1-keyscan-rsa-sha2.patch
+++ b/SOURCES/openssh-8.0p1-keyscan-rsa-sha2.patch
--- a/SOURCES/openssh-8.0p1-openssl-evp.patch
+++ b/SOURCES/openssh-8.0p1-openssl-evp.patch
--- a/SOURCES/openssh-8.0p1-openssl-kdf.patch
+++ b/SOURCES/openssh-8.0p1-openssl-kdf.patch
--- a/SOURCES/openssh-8.0p1-openssl-pem.patch
+++ b/SOURCES/openssh-8.0p1-openssl-pem.patch
--- a/SOURCES/openssh-8.0p1-pkcs11-uri.patch
+++ b/SOURCES/openssh-8.0p1-pkcs11-uri.patch
--- a/SOURCES/openssh-8.0p1-preserve-pam-errors.patch
+++ b/SOURCES/openssh-8.0p1-preserve-pam-errors.patch
--- a/SOURCES/openssh-8.0p1-proxyjump-loops.patch
+++ b/SOURCES/openssh-8.0p1-proxyjump-loops.patch
--- a/SOURCES/openssh-8.0p1-rdomain.patch
+++ b/SOURCES/openssh-8.0p1-rdomain.patch
--- a/SOURCES/openssh-8.0p1-restore-nonblock.patch
+++ b/SOURCES/openssh-8.0p1-restore-nonblock.patch
--- a/SOURCES/openssh-8.0p1-scp-tests.patch
+++ b/SOURCES/openssh-8.0p1-scp-tests.patch
--- a/SOURCES/openssh-8.0p1-sftp-realpath.patch
+++ b/SOURCES/openssh-8.0p1-sftp-realpath.patch
--- a/SOURCES/openssh-8.0p1-sftp-timespeccmp.patch
+++ b/SOURCES/openssh-8.0p1-sftp-timespeccmp.patch
--- a/SOURCES/openssh-8.0p1-sshd_config.patch
+++ b/SOURCES/openssh-8.0p1-sshd_config.patch
--- a/SOURCES/openssh-8.0p1-sshd_include.patch
+++ b/SOURCES/openssh-8.0p1-sshd_include.patch
--- a/SOURCES/openssh-8.0p1-upstream-ignore-SIGPIPE.patch
+++ b/SOURCES/openssh-8.0p1-upstream-ignore-SIGPIPE.patch
--- a/SOURCES/openssh-8.0p1-x11-without-ipv6.patch
+++ b/SOURCES/openssh-8.0p1-x11-without-ipv6.patch
--- a/SOURCES/openssh-8.7p1-minimize-sha1-use.patch
+++ b/SOURCES/openssh-8.7p1-minimize-sha1-use.patch
--- a/SOURCES/openssh-8.7p1-scp-kill-switch.patch
+++ b/SOURCES/openssh-8.7p1-scp-kill-switch.patch
--- a/SOURCES/openssh-8.7p1-upstream-cve-2021-41617.patch
+++ b/SOURCES/openssh-8.7p1-upstream-cve-2021-41617.patch
--- a/SOURCES/openssh-9.1p1-sshbanner.patch
+++ b/SOURCES/openssh-9.1p1-sshbanner.patch
--- a/SOURCES/openssh-9.3p1-upstream-cve-2023-38408.patch
+++ b/SOURCES/openssh-9.3p1-upstream-cve-2023-38408.patch
--- a/SOURCES/openssh-9.4p2-limit-delay.patch
+++ b/SOURCES/openssh-9.4p2-limit-delay.patch
--- a/SOURCES/openssh-9.6p1-CVE-2023-48795.patch
+++ b/SOURCES/openssh-9.6p1-CVE-2023-48795.patch
--- a/SOURCES/openssh-9.6p1-CVE-2023-51385.patch
+++ b/SOURCES/openssh-9.6p1-CVE-2023-51385.patch
--- a/SPECS/openssh.spec
+++ b/SPECS/openssh.spec
--- a/SOURCES/pam_ssh_agent-rmheaders
+++ b/SOURCES/pam_ssh_agent-rmheaders
--- a/SOURCES/pam_ssh_agent_auth-0.10.2-compat.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.10.2-compat.patch
--- a/SOURCES/pam_ssh_agent_auth-0.10.2-dereference.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.10.2-dereference.patch
--- a/SOURCES/pam_ssh_agent_auth-0.10.3-seteuid.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.10.3-seteuid.patch
--- a/SOURCES/pam_ssh_agent_auth-0.9.2-visibility.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.9.2-visibility.patch
--- a/SOURCES/pam_ssh_agent_auth-0.9.3-agent_structure.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.9.3-agent_structure.patch
--- a/SOURCES/pam_ssh_agent_auth-0.9.3-build.patch
+++ b/SOURCES/pam_ssh_agent_auth-0.9.3-build.patch
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -0,0 +1,23 @@
+/fips-disabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openssh
+      name: /Plans/ci/fips-disabled-buildroot-enabled
+
+/fips-enabled-buildroot-enabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openssh
+      name: /Plans/ci/fips-enabled-buildroot-enabled
+
+/fips-disabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openssh
+      name: /Plans/ci/fips-disabled-buildroot-disabled
+
+/fips-enabled-buildroot-disabled:
+  plan:
+    import:
+      url: https://pkgs.devel.redhat.com/git/tests/openssh
+      name: /Plans/ci/fips-enabled-buildroot-disabled
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+SHA512 (openssh-8.0p1.tar.gz) = e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
+SHA512 (openssh-8.0p1.tar.gz.asc) = fe9e7383d9467e869762864f2b719165d9a3f2c5316c07067df1d45fc7819bd2cb8ef758454865595688804a4c160dd3d3aaee4c5f887859555d2c7bb8c4592b
+SHA512 (DJM-GPG-KEY.gpg) = db1191ed9b6495999e05eed2ef863fb5179bdb63e94850f192dad68eed8579836f88fbcfffd9f28524fe1457aff8cd248ee3e0afc112c8f609b99a34b80ecc0d
+SHA512 (pam_ssh_agent_auth-0.10.3.tar.bz2) = d75062c4e46b0b011f46aed9704a99049995fea8b5115ff7ee26dad7e93cbcf54a8af7efc6b521109d77dc03c6f5284574d2e1b84c6829cec25610f24fb4bd66
--- a/SOURCES/ssh-keycat.pam
+++ b/SOURCES/ssh-keycat.pam
--- a/SOURCES/sshd-keygen
+++ b/SOURCES/sshd-keygen
--- a/SOURCES/sshd-keygen.target
+++ b/SOURCES/sshd-keygen.target
--- a/SOURCES/sshd-keygen@.service
+++ b/SOURCES/sshd-keygen@.service
--- a/SOURCES/sshd.pam
+++ b/SOURCES/sshd.pam
--- a/SOURCES/sshd.service
+++ b/SOURCES/sshd.service
--- a/SOURCES/sshd.socket
+++ b/SOURCES/sshd.socket
--- a/SOURCES/sshd.sysconfig
+++ b/SOURCES/sshd.sysconfig
--- a/SOURCES/sshd.tmpfiles
+++ b/SOURCES/sshd.tmpfiles
--- a/Show More
+++ b/Show More