Date: Fri, 23 Jun 2023 23:20:04 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5abd4d378e38 - main - kerberos: Request the OpenSSL 1.1 API Message-ID: <202306232320.35NNK4C3046947@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5abd4d378e3807f44686b8087f00cd438ec602ce commit 5abd4d378e3807f44686b8087f00cd438ec602ce Author: Pierre Pronchery <pierre@freebsdfoundation.org> AuthorDate: 2023-05-25 06:25:18 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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 <bsd.lib.mk> 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 <bsd.lib.mk> 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 <bsd.lib.mk> 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 <bsd.lib.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306232320.35NNK4C3046947>