From nobody Wed Jul 5 20:01:14 2023 X-Original-To: dev-commits-src-main@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 4Qx9XB6MYFz4lFWv; Wed, 5 Jul 2023 20:01:14 +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 4Qx9XB5s2Qz3QMr; Wed, 5 Jul 2023 20:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688587274; 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=hWPOa+cE5roT5D8GPvuIQ37tdKBtx/nQXPm13y32kSE=; b=RClFk8U2y9KxYIWS75U0h5iMM2fR2HzFhayPg660OT5JUyDJUYKPTel3iDSnKaQQL0OUgh TsRo2dx4MKiRln4JYKirQ5YZ19/vvsNCSWLe3jcJH1tt8kf5zrObYDsT6p8CFm0vH7caH0 GTO1sMWDLpX1qCvwweFGrQ8lcj5sRkhzuE00rJasXADswHJUIyX3g+MEpIUu2h9q47FjfP 8oxWn1Zd58b7KtE+k1OvyymiAFaMb22ZvtnFjtdOuABBPmSy2sDpZsXRVSV2yonQofBV66 olFR9pOpBiffeQ2YJHf7bxe4mKO/hQQvH9jXlSXt+BND1fH3k+RGO6A9EIM2KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688587274; 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=hWPOa+cE5roT5D8GPvuIQ37tdKBtx/nQXPm13y32kSE=; b=OILpJKemPQoSPSCm6tDWlVRMS4g3Mpn4q3UFDcQsn1iePbZfkT/70BNVg3Y+XFeOb/q6+n MqWmkpSkWrR1XB+ox0y6OBqzq6LTuCIq6AdQrXF6+7uqADKvR/NAYszbouuqF8lotyV5p5 BB/Mw7w5r9mHm5t9suDuXOsiDs1vvUSkLkg1OwwiQmbySSawOmeLJPBi3TxDmtVk/h4V9r APWHBy5OuPJRwMMTCfgCcd1rj3heI8/6KteCw8cSINY9eeQzfxmAWJEEeIk8G8vMUdcuB6 aKvEZ8i8RJveW5yv6AQ4JkkP84tM/1dTrzBnAj/KwrhYyiFlCLrCylDJHhhZWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688587274; a=rsa-sha256; cv=none; b=Z76kWSqsCUyBKkOJd2R8FVaKBLulomTSYKIOOw+BkdA7lDvfWZANO/VZksfc18ghBmL/RV ReJIfDi9YK4Wp34WXGQYvea6Qg8sRiFmvSdPDKsxHDd9h8i/5OtJmLHq+OCWkJhLUv6+uo VTZgZLerZ8+6uPUoel0zoHHdd1UBKmG2vG7x3BsBplVtQnuWqbUceK1LLhX9nEHKuTH64t x7tgujB9gVg3ntFQPNN8+MkztVelr3fGOaObXyWE7c6EOJ6RNQxs7nyTMigNLpf/nE9IgM HYyHDWIo0BeANbEiraoqCN+k+mffQ9diMt+8AQKnktvd3e4EJKjCYm13Tj9FQw== 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 4Qx9XB4yGXzShf; Wed, 5 Jul 2023 20:01:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 365K1Eqf058656; Wed, 5 Jul 2023 20:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 365K1EWZ058655; Wed, 5 Jul 2023 20:01:14 GMT (envelope-from git) Date: Wed, 5 Jul 2023 20:01:14 GMT Message-Id: <202307052001.365K1EWZ058655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4a3cc17e3172 - main - libcrypto: expand the common Makefile for providers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a3cc17e317212d46a70ff88fd67889f06468ed5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4a3cc17e317212d46a70ff88fd67889f06468ed5 commit 4a3cc17e317212d46a70ff88fd67889f06468ed5 Author: Pierre Pronchery AuthorDate: 2023-06-30 17:20:31 +0000 Commit: Mark Johnston CommitDate: 2023-07-05 20:00:54 +0000 libcrypto: expand the common Makefile for providers OpenSSL 3 supports a modular architecture, allowing different providers to bring specific implementations of cryptographical algorithms. This change adds mandatory source files to every provider. Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/787 --- secure/lib/libcrypto/modules/Makefile.inc | 4 +++- secure/lib/libcrypto/modules/fips/Makefile | 3 +-- secure/lib/libcrypto/modules/legacy/Makefile | 6 +----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc index 9047c938ef1d..6e74ff36a9cf 100644 --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -9,7 +9,9 @@ CFLAGS+= -I${LCRYPTO_SRC}/include CFLAGS+= -I${LCRYPTO_SRC}/providers/common/include CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include -.include +# common +SRCS+= provider_err.c provider_ctx.c +SRCS+= provider_util.c .PATH: ${LCRYPTO_SRC}/providers \ ${LCRYPTO_SRC}/providers/common diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index 84123381bb1d..510d017d27ab 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -238,8 +238,7 @@ SRCS+= keccak1600.c .endif # common -SRCS+= provider_err.c provider_ctx.c -SRCS+= provider_util.c capabilities.c bio_prov.c digest_to_nid.c \ +SRCS+= capabilities.c bio_prov.c digest_to_nid.c \ securitycheck.c provider_seeding.c SRCS+= securitycheck_fips.c diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index 3eef2549d44f..c98ca9553e20 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -2,11 +2,7 @@ SHLIB_NAME?= legacy.so -SRCS= legacyprov.c prov_running.c - -# common -SRCS+= provider_err.c provider_ctx.c -SRCS+= provider_util.c +SRCS+= legacyprov.c prov_running.c # ciphers SRCS+= ciphercommon.c ciphercommon_hw.c ciphercommon_block.c \