From nobody Fri Apr 15 16:37:18 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EFDE17EE7DC; Fri, 15 Apr 2022 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kg26k4rcjz3MWJ; Fri, 15 Apr 2022 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650040638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBcePuq2cseYaUoarhelhBNUPJk/rGfPq0KPP/XJeFE=; b=YSjSK26cNoKOP5zIaVLZvEKxWLAmg0upjis0mv8o1t6PfnxXNhR16J2ZWy79Ya2B2lUUBV /PnP5VNUnwofPVIOY3HM1og4Wjh3eGr2ohKNT3NFhfp+dk2eAz538FK6hPle6ii2Yxocrb jLlP/DuCTLmAKsVq77vR/DOmW6IGjvSvTUAR3Xme1XK4Fquw0AqJrPrHXU6FKdo89Fehvu L0YAy9gwx0PRMsqtwdQC0bkJghYWwC6apX2HOsq7OBLe2QGmhCA711gQ5gyyYVrjy8P8Us ekk9ImW1bxMUbXJJzdYhn5aP5wGwHyhfg21QmwSlVBVh5wflukKFI0fJt1n9IA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 76B6E18675; Fri, 15 Apr 2022 16:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23FGbIR9039025; Fri, 15 Apr 2022 16:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FGbIEF039024; Fri, 15 Apr 2022 16:37:18 GMT (envelope-from git) Date: Fri, 15 Apr 2022 16:37:18 GMT Message-Id: <202204151637.23FGbIEF039024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: faa9ffff57d4 - stable/13 - ssh: generate SK config file using private cbor and fido2 libs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: faa9ffff57d4620142b195560a425c497673ac2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650040638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBcePuq2cseYaUoarhelhBNUPJk/rGfPq0KPP/XJeFE=; b=JsLd3KLQmC8Bz3yBX8ojrCGkzeAiwAo7WLugkjuvbgvZzvasuD72GfZZ2F/f4ODmCJLZED jM0Nh+auNJmynKgfmYWNBfxHJ0EwUNATT/Uz5ETqRTkq5kJcsGRA/cxqZ7GhnMaBvqaVzg 9xB/z3dR85JNF8xybCx8aW4cFyE+4ztqwPRLsv4ynNQpRIC11Nm8hJRshrBGAoCPufPtu7 DSshUgLjxzA/qmLtdM7gmSuODUrALzdCYf/9AKjFYmErGwuin0rw0X5hyuYJic5bdCfvMm 0jcmJsFCMrVfDYrI1DoerI/VTM0d7RZo/z1UYDKGF5zO4lm2Bju88K93UbVThw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650040638; a=rsa-sha256; cv=none; b=ydQKogr0nNgGO6axE66HMF6OH2wx6cvnOSY0/EFT9Qh1AFxdf9LgXfG9bL8HDaMVf3L54l tOjGt1aPR82+jjlDf5DV1CDE9xRGn7F6bWQgd5SGXgmmNaajqx4t1RyhIVtUShOZ8HpWnz Wttb5VAdkU8/V30ki7bvYrTWbWtwl8Q/nwb37+S5YQCsud5ZInmBqBuJILvKhYPZXPmCaX OYymR+4wAKW3otdTJ2GSKr3LctzONOzdNgiYfiMFS0Mv1jto5mMtWS0P5svMn0VGysVcWg mwtR0LTm1qB9YXAbvOy+6a+mUe4x5Sw4G7UGS9EOuliDcZNoR4Dog+Jl0SSSrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=faa9ffff57d4620142b195560a425c497673ac2b commit faa9ffff57d4620142b195560a425c497673ac2b Author: Ed Maste AuthorDate: 2022-03-01 21:39:16 +0000 Commit: Ed Maste CommitDate: 2022-04-15 16:30:37 +0000 ssh: generate SK config file using private cbor and fido2 libs Specify -lprivatecbor and -lprivatefido2 in OpenSSH's configure.ac, and pass -I paths to libcbor and libfido2's contrib src location. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34440 (cherry picked from commit 73104d583850f7447ae1fe70c59a42e69d9d407c) --- crypto/openssh/configure.ac | 6 +++--- crypto/openssh/freebsd-configure.sh | 22 +++++++++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index 428f3ff55a87..28a64d8f07db 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -3263,16 +3263,16 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then LIBFIDO2=`$PKGCONFIG --libs libfido2` CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libfido2`" else - LIBFIDO2="-lfido2 -lcbor" + LIBFIDO2="-lprivatefido2 -lprivatecbor" fi OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'` - AC_CHECK_LIB([fido2], [fido_init], + AC_CHECK_LIB([privatefido2], [fido_init], [ AC_SUBST([LIBFIDO2]) AC_DEFINE([ENABLE_SK_INTERNAL], [], [Enable for built-in U2F/FIDO support]) enable_sk="built-in" - ], [ AC_MSG_ERROR([no usable libfido2 found]) ], + ], [ AC_MSG_ERROR([no usable libprivatefido2 found]) ], [ $OTHERLIBS ] ) saved_LIBS="$LIBS" diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh index 4d405a0ffacb..3cde318ade58 100755 --- a/crypto/openssh/freebsd-configure.sh +++ b/crypto/openssh/freebsd-configure.sh @@ -12,7 +12,6 @@ configure_args=" --with-libedit --with-ssl-engine --without-xauth - --without-security-key-builtin " set -e @@ -34,11 +33,28 @@ sh configure $configure_args --with-kerberos5=/usr mv config.log config.log.kerberos5 mv config.h config.h.kerberos5 -# Generate config.h without krb5 -sh configure $configure_args --without-kerberos5 +# Generate config.h with built-in security key support +# +# We install libcbor and libfido2 as PRIVATELIB, so the headers are not +# available for configure - add their paths via CFLAGS as a slight hack. +# configure.ac is also patched to specify -lprivatecbor and -lprivatefido2 +# rather than -lcbor and -lfido2. +export CFLAGS="-I$openssh/../../contrib/libcbor/src -I$openssh/../../contrib/libfido2/src" +sh configure $configure_args --with-security-key-builtin +unset CFLAGS +mv config.log config.log.sk-builtin +mv config.h config.h.sk-builtin + +# Generate config.h without krb5 or SK support +sh configure $configure_args --without-kerberos5 --without-security-key-builtin # Extract the difference echo '/* $Free''BSD$ */' > krb5_config.h diff -u config.h.kerberos5 config.h | sed -n '/^-#define/s/^-//p' | grep -Ff /dev/stdin config.h.kerberos5 >> krb5_config.h + +# Extract the difference - SK +diff -u config.h.sk-builtin config.h | + sed -n '/^-#define/s/^-//p' | + grep -Ff /dev/stdin config.h.sk-builtin > sk_config.h