From nobody Fri Jun 23 23:20:04 2023 X-Original-To: dev-commits-src-all@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 4QntW94bd8z4g664; Fri, 23 Jun 2023 23:20:05 +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 4QntW91KBmz3Qy0; Fri, 23 Jun 2023 23:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562405; 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=ayAdrK4y1nfMaC5pVOSkcLYQ+EPiy0xtNFsJae/QaLQ=; b=XkKoISorS4Oiv8BS6mBw7irlog7fH72m7G6hlD9X85HqmNr2p2MocbkE1chuTN8bozSe/r XKI7jx4OFadkWEGWDg7QialehT3Isb2PG0JEBLfTlaCyCW+YSyA2ea/zyoEJdFwa6DyO6W mUNQ4F71Cz8sRFArHw26aZl0QimDRKYBWZae7MHCFfXxJNvKnV/J0EScD9KyOnlWjmSV8F We9Gr+t68ztIlrMaxYN3nfTxB+ETDJEgCl/K021a1FSRGoXoj6IzT9US/eCMvIyh6cGGJD dkXgk8NjfCzZteYIATIeTDovoWvK7M5j+S/H5sN77wDadNMi3nsYBHsIM1DapA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687562405; 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=ayAdrK4y1nfMaC5pVOSkcLYQ+EPiy0xtNFsJae/QaLQ=; b=Mqm985K3GKx8ZpPRUbKrtH2mrSKOzcXFo7+n7ingpj9jwMBaQkOL0piLH935jB9Ex0y0iW 8oe8k/OZrhQgxvHsUBzDzrM/DeeQG/nCsZqjMX84Rhv1iX706tyIvp30fcb5eyh11NZk8K S3dwhNU45XNJwLsXr5Lem5+m7G79hYk4FLNItgMbgOcxR/9KylXpQ01eUmdQhsn4eISZwP xoVoSdG9gs3888hyy0Sln5C4Hau5+V4D/afq340WSZbo1zGd3kJpHntbjc/b/EMBRDJvRG RjjnOIUQh2ot6deO7KJH8EAA/HIdfAurQiiH3pGuLnXWxJiEwlq/giH6QYipDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687562405; a=rsa-sha256; cv=none; b=dt3MZ8eU83P2JA2hJ58vY3HxuqLYmUhvZ4qdFoJs45McuNbuErJ7Zq7+bsbG6IiHWRN8wO rD+WjWEbp+5jyNRvZEXiZLP4Ihg30haP1wpYOVuhuS4I0e1aPOgznAK+4oIzcpmepdgEG9 EwnlRrpcFcnjsI1yVn7R+Zb9xVXbLS0PcWj0nkHf+rmjlPdSBmT1Cd2S0BWUJZmnJfxa8X o7uKYBEI2TdJ8miVNFYAxysjJs5BdHmj5lZpK59IkbjXnkbaP/4xXOqDUbIuBOIHFwNxsc wVckmin+LmcTm1mZkfiNBHWnS8K622tqTrEAkExWNyf5WuyFfH6d3dOeqbbGLQ== 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 4QntW90QFHzNrL; Fri, 23 Jun 2023 23:20:05 +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 35NNK4fv046949; Fri, 23 Jun 2023 23:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNK4C3046947; Fri, 23 Jun 2023 23:20:04 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:20:04 GMT Message-Id: <202306232320.35NNK4C3046947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5abd4d378e38 - main - kerberos: Request the OpenSSL 1.1 API List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5abd4d378e3807f44686b8087f00cd438ec602ce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5abd4d378e3807f44686b8087f00cd438ec602ce commit 5abd4d378e3807f44686b8087f00cd438ec602ce Author: Pierre Pronchery AuthorDate: 2023-05-25 06:25:18 +0000 Commit: Ed Maste CommitDate: 2023-06-23 22:53:36 +0000 kerberos: Request the OpenSSL 1.1 API This is needed to build with OpenSSL 3.0; a future update should switch to using native OpenSSL 3 APIs. Sponsored by: The FreeBSD Foundation --- kerberos5/lib/libgssapi_krb5/Makefile | 1 + kerberos5/lib/libgssapi_ntlm/Makefile | 1 + kerberos5/lib/libheimntlm/Makefile | 1 + kerberos5/lib/libhx509/Makefile | 1 + kerberos5/lib/libkdc/Makefile | 1 + kerberos5/lib/libkrb5/Makefile | 1 + kerberos5/usr.bin/hxtool/Makefile | 1 + 7 files changed, 7 insertions(+) diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index 3d50b002d9c9..06dbe2dd8174 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -83,6 +83,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${SRCTOP}/contrib/com_err CFLAGS+=-I. +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index a6860d54add9..9a56bb23fe30 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -44,6 +44,7 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/ntlm CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/ntlm +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index 03f37a6ad71d..51031196b38e 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -9,6 +9,7 @@ SRCS= ntlm.c ntlm_err.c ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken \ -I${SRCTOP}/contrib/com_err +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map MAN= ntlm_buf.3 \ diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index a17216d254a6..c27602162455 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -216,6 +216,7 @@ CFLAGS+=-I${KRB5DIR}/lib/wind CFLAGS+=-I${KRB5DIR}/lib/roken CFLAGS+=-I${SRCTOP}/contrib/com_err CFLAGS+=-I. +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index e98967d0c3d1..cc8ecb9d8387 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -32,6 +32,7 @@ CFLAGS+= -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/kdc \ -I${SRCTOP}/contrib/com_err +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 2f3304dc4e7d..6706bd7f5b74 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -626,6 +626,7 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/base \ -I${SRCTOP}/contrib/com_err \ -I. +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L .include diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index cbae762b3091..325af21399eb 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -10,6 +10,7 @@ CFLAGS+= -I${KRB5DIR}/lib/hx509 \ -I${KRB5DIR}/lib/sl \ -I${SRCTOP}/contrib/com_err \ -I. +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD= hx509 roken asn1 crypto sl vers edit SRCS= hxtool.c hxtool-commands.c hxtool-commands.h