net-misc/openssh: add optional support for XMSS key algorithm

Signed-off-by: Sergey Alirzaev <zl29ah@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13037
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index 29134fc060dbcfb7c7a15f62ae25dc9f50805234..7613265c18a179cb8652a7ddd576fcdafcfbf918 100644 (file)
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -32,6 +32,7 @@ ssh-keygen and sftp-server. OpenSSH supports SSH protocol versions 1.3, 1.5, and
     <flag name="ssh1">Support the legacy/weak SSH1 protocol</flag>
     <flag name="ssl">Enable additional crypto algorithms via OpenSSL</flag>
     <flag name="X509">Adds support for X.509 certificate authentication</flag>
+    <flag name="xmss">Enable XMSS post-quantum authentication algorithm</flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:openssh:openssh</remote-id>

diff --git a/net-misc/openssh/openssh-8.0_p1-r2.ebuild b/net-misc/openssh/openssh-8.0_p1-r2.ebuild
index a0936dbd331d04b3772f43c14e3951a28a7d9515..c0a1abeb3597ef599f4338d2b03b780149c8e6e5 100644 (file)
--- a/net-misc/openssh/openssh-8.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r2.ebuild
@@ -34,7 +34,7 @@ LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ldns? ( ssl )
        pie? ( !static )
@@ -267,6 +267,7 @@ src_configure() {
 
        use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
        use static && append-ldflags -static
+       use xmss && append-cflags -DWITH_XMSS
 
        local myconf=(
                --with-ldflags="${LDFLAGS}"