diff options
Diffstat (limited to 'kerberos5/lib')
49 files changed, 133 insertions, 64 deletions
diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index 1f2356d6e154..73395b86c814 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,4 +1,3 @@ -# $FreeBSD$ .include <src.opts.mk> diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc index 264328e906b6..6d0bed2058ec 100644 --- a/kerberos5/lib/Makefile.inc +++ b/kerberos5/lib/Makefile.inc @@ -1,4 +1,3 @@ -# $FreeBSD$ SHLIB_MAJOR?= 11 diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index f75445e47f63..095c7089dc85 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= asn1 LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libasn1/Makefile.depend b/kerberos5/lib/libasn1/Makefile.depend index 3320e9e4b31a..4a240d812cae 100644 --- a/kerberos5/lib/libasn1/Makefile.depend +++ b/kerberos5/lib/libasn1/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libasn1/version.map b/kerberos5/lib/libasn1/version.map index 614c2edaf990..fb39f852548b 100644 --- a/kerberos5/lib/libasn1/version.map +++ b/kerberos5/lib/libasn1/version.map @@ -1,7 +1,6 @@ # # Export all symbols but _init and _fini. # -# $FreeBSD$ # HEIMDAL_ASN1_1.0 { global: diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index 9ba59dcb48c5..2a47f35a12d6 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= gssapi_krb5 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined @@ -81,6 +82,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_krb5/Makefile.depend b/kerberos5/lib/libgssapi_krb5/Makefile.depend index a4de7889fb1d..9e7ef0d9528a 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile.depend +++ b/kerberos5/lib/libgssapi_krb5/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libgssapi_krb5/gss_krb5.c b/kerberos5/lib/libgssapi_krb5/gss_krb5.c index 94237e22376b..5dc0dfdb9a32 100644 --- a/kerberos5/lib/libgssapi_krb5/gss_krb5.c +++ b/kerberos5/lib/libgssapi_krb5/gss_krb5.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005 Doug Rabson * All rights reserved. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <gssapi/gssapi.h> diff --git a/kerberos5/lib/libgssapi_krb5/gss_oid.c b/kerberos5/lib/libgssapi_krb5/gss_oid.c index d359afae4d31..a52c66abbc89 100644 --- a/kerberos5/lib/libgssapi_krb5/gss_oid.c +++ b/kerberos5/lib/libgssapi_krb5/gss_oid.c @@ -1,5 +1,4 @@ /* Generated file */ -/* $FreeBSD$ */ #include <gssapi/gssapi.h> #include <roken.h> #include "config.h" diff --git a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c index 0b19edcdc301..faf54cf1e5ea 100644 --- a/kerberos5/lib/libgssapi_krb5/pname_to_uid.c +++ b/kerberos5/lib/libgssapi_krb5/pname_to_uid.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Isilon Inc http://www.isilon.com/ * Authors: Doug Rabson <dfr@rabson.org> @@ -26,7 +26,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $FreeBSD$ */ #include <errno.h> #include <pwd.h> diff --git a/kerberos5/lib/libgssapi_krb5/prefix.c b/kerberos5/lib/libgssapi_krb5/prefix.c index 539ea93fa9c4..39922665f49f 100644 --- a/kerberos5/lib/libgssapi_krb5/prefix.c +++ b/kerberos5/lib/libgssapi_krb5/prefix.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Doug Rabson * All rights reserved. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ const char * diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index b5edb08a8d47..591efcaff1dc 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= gssapi_ntlm LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined @@ -42,6 +43,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/libgssapi_ntlm/Makefile.depend b/kerberos5/lib/libgssapi_ntlm/Makefile.depend index b860dd2f7b73..ff3483fded34 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile.depend +++ b/kerberos5/lib/libgssapi_ntlm/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ diff --git a/kerberos5/lib/libgssapi_ntlm/prefix.c b/kerberos5/lib/libgssapi_ntlm/prefix.c index f3e82f35a92a..841500450861 100644 --- a/kerberos5/lib/libgssapi_ntlm/prefix.c +++ b/kerberos5/lib/libgssapi_ntlm/prefix.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Doug Rabson * All rights reserved. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <gssapi/gssapi.h> diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index 1ccf1377e8bc..c6d92389db23 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined diff --git a/kerberos5/lib/libgssapi_spnego/Makefile.depend b/kerberos5/lib/libgssapi_spnego/Makefile.depend index ec85bb9e1e38..9561414fcad0 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile.depend +++ b/kerberos5/lib/libgssapi_spnego/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ diff --git a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c index 7abca22690ae..a0cc8e6b27e4 100644 --- a/kerberos5/lib/libgssapi_spnego/freebsd_compat.c +++ b/kerberos5/lib/libgssapi_spnego/freebsd_compat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2008 Doug Rabson * All rights reserved. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ #include <gssapi/gssapi.h> diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index fda622d6945a..27e246e1bee3 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= hdb LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} @@ -41,7 +42,6 @@ INCS= hdb-protos.h \ SRCS= common.c \ db.c \ - db3.c \ dbinfo.c \ ext.c \ hdb-ldap.c \ diff --git a/kerberos5/lib/libhdb/Makefile.depend b/kerberos5/lib/libhdb/Makefile.depend index a4c3dac10cba..afeb81e28105 100644 --- a/kerberos5/lib/libhdb/Makefile.depend +++ b/kerberos5/lib/libhdb/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile index b6bf526b3522..99c637ee3c3e 100644 --- a/kerberos5/lib/libheimbase/Makefile +++ b/kerberos5/lib/libheimbase/Makefile @@ -1,4 +1,5 @@ -#$FreeBSD$ + +PACKAGE= kerberos-lib LIB= heimbase LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libheimbase/Makefile.depend b/kerberos5/lib/libheimbase/Makefile.depend index 25b26ea326c8..577dc5747f1e 100644 --- a/kerberos5/lib/libheimbase/Makefile.depend +++ b/kerberos5/lib/libheimbase/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile index 9ec712572371..a8b5846128f4 100644 --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -1,4 +1,5 @@ -#$FreeBSD$ + +PACKAGE= kerberos-lib LIB= heimipcc PRIVATELIB= diff --git a/kerberos5/lib/libheimipcc/Makefile.depend b/kerberos5/lib/libheimipcc/Makefile.depend index 19f13356b622..25a1289917df 100644 --- a/kerberos5/lib/libheimipcc/Makefile.depend +++ b/kerberos5/lib/libheimipcc/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile index b1201f65a842..582298b0e772 100644 --- a/kerberos5/lib/libheimipcs/Makefile +++ b/kerberos5/lib/libheimipcs/Makefile @@ -1,4 +1,5 @@ -#$FreeBSD$ + +PACKAGE= kerberos-lib LIB= heimipcs PRIVATELIB= diff --git a/kerberos5/lib/libheimipcs/Makefile.depend b/kerberos5/lib/libheimipcs/Makefile.depend index 248469a4ba59..139edc48ce66 100644 --- a/kerberos5/lib/libheimipcs/Makefile.depend +++ b/kerberos5/lib/libheimipcs/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index 148aa8df1f70..f669be55b1cc 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= heimntlm LDFLAGS= -Wl,--no-undefined @@ -7,6 +8,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/libheimntlm/Makefile.depend b/kerberos5/lib/libheimntlm/Makefile.depend index af11e432910e..caa70902c3e7 100644 --- a/kerberos5/lib/libheimntlm/Makefile.depend +++ b/kerberos5/lib/libheimntlm/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index 1696ffb73cb8..e74e442b636b 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= hx509 LDFLAGS= -Wl,--no-undefined @@ -214,6 +215,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/libhx509/Makefile.depend b/kerberos5/lib/libhx509/Makefile.depend index 1f86719a2664..bb9c90141ad6 100644 --- a/kerberos5/lib/libhx509/Makefile.depend +++ b/kerberos5/lib/libhx509/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile index fecdf915070e..76e934991470 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= kadm5clnt LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libkadm5clnt/Makefile.depend b/kerberos5/lib/libkadm5clnt/Makefile.depend index 0049fff39436..ec6bcd69afed 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile.depend +++ b/kerberos5/lib/libkadm5clnt/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile index 733242ce99af..df5c9b99f1a0 100644 --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= kadm5srv LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libkadm5srv/Makefile.depend b/kerberos5/lib/libkadm5srv/Makefile.depend index 3a500695511e..ec6bcd69afed 100644 --- a/kerberos5/lib/libkadm5srv/Makefile.depend +++ b/kerberos5/lib/libkadm5srv/Makefile.depend @@ -1,8 +1,6 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ - gnu/lib/csu \ include \ include/arpa \ include/xlocale \ diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 24400b8b2edc..28d9ca50822c 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= kafs5 LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libkafs5/Makefile.depend b/kerberos5/lib/libkafs5/Makefile.depend index d95c61bfe97e..a7fe3aa7c66c 100644 --- a/kerberos5/lib/libkafs5/Makefile.depend +++ b/kerberos5/lib/libkafs5/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libkafs5/version.map b/kerberos5/lib/libkafs5/version.map index 1e7b0a8720a5..02f4a279e88d 100644 --- a/kerberos5/lib/libkafs5/version.map +++ b/kerberos5/lib/libkafs5/version.map @@ -1,5 +1,4 @@ # -# $FreeBSD$ # HEIMDAL_KAFS5_1.0 { global: diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index 24267a8dd419..19c508c9c4fe 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -1,4 +1,5 @@ -#$FreeBSD$ + +PACKAGE= kerberos-lib LIB= kdc LDFLAGS= -Wl,--no-undefined @@ -30,6 +31,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/libkdc/Makefile.depend b/kerberos5/lib/libkdc/Makefile.depend index c5be185c9422..c62a7cd3eff1 100644 --- a/kerberos5/lib/libkdc/Makefile.depend +++ b/kerberos5/lib/libkdc/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 75e065a2192e..160643e36b25 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= krb5 LDFLAGS= -Wl,--no-undefined @@ -624,6 +625,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/lib/libkrb5/Makefile.depend b/kerberos5/lib/libkrb5/Makefile.depend index 573a0af649af..7756c6c35834 100644 --- a/kerberos5/lib/libkrb5/Makefile.depend +++ b/kerberos5/lib/libkrb5/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 95505d2a1ff9..ca6d090e64f0 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= roken LIBADD= crypt @@ -73,9 +74,13 @@ SRCS= base64.c \ vis.c \ warnerr.c \ write_pid.c \ - xfree.c + xfree.c \ + fbsd_ossl_provider_load.c -CFLAGS+=-I${KRB5DIR}/lib/roken -I. +CFLAGS+=-I${KRB5DIR}/lib/roken \ + -I${SRCTOP}/kerberos5/include \ + -I${KRB5DIR}/lib/krb5 \ + -I${SRCTOP}/crypto/openssl/include -I. CLEANFILES= roken.h diff --git a/kerberos5/lib/libroken/Makefile.depend b/kerberos5/lib/libroken/Makefile.depend index f5e15167a601..a874da9fe548 100644 --- a/kerberos5/lib/libroken/Makefile.depend +++ b/kerberos5/lib/libroken/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libroken/fbsd_ossl_provider_load.c b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c new file mode 100644 index 000000000000..2328041bc166 --- /dev/null +++ b/kerberos5/lib/libroken/fbsd_ossl_provider_load.c @@ -0,0 +1,78 @@ +#include <dlfcn.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <openssl/provider.h> + +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) +#define CRYPTO_LIBRARY "/lib/libcrypto.so.30" +static void fbsd_ossl_provider_unload(void); +static void print_dlerror(char *); +static OSSL_PROVIDER *legacy; +static OSSL_PROVIDER *deflt; +static int providers_loaded = 0; +static OSSL_PROVIDER * (*ossl_provider_load)(OSSL_LIB_CTX *, const char*) = NULL; +static int (*ossl_provider_unload)(OSSL_PROVIDER *) = NULL; +static void *crypto_lib_handle = NULL; + +static void +fbsd_ossl_provider_unload(void) +{ + if (ossl_provider_unload == NULL) { + if (!(ossl_provider_unload = (int (*)(OSSL_PROVIDER*)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_unload"))) { + print_dlerror("Unable to link OSSL_PROVIDER_unload"); + return; + } + } + if (providers_loaded == 1) { + (*ossl_provider_unload)(legacy); + (*ossl_provider_unload)(deflt); + providers_loaded = 0; + } +} + +static void +print_dlerror(char *message) +{ + char *errstr; + + if ((errstr = dlerror()) != NULL) + fprintf(stderr, "%s: %s\n", + message, errstr); +} +#endif + +int +fbsd_ossl_provider_load(void) +{ +#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) + if (crypto_lib_handle == NULL) { + if (!(crypto_lib_handle = dlopen(CRYPTO_LIBRARY, + RTLD_LAZY|RTLD_GLOBAL))) { + print_dlerror("Unable to load libcrypto.so"); + return (EINVAL); + } + } + if (ossl_provider_load == NULL) { + if (!(ossl_provider_load = (OSSL_PROVIDER * (*)(OSSL_LIB_CTX*, const char *)) dlsym(crypto_lib_handle, "OSSL_PROVIDER_load"))) { + print_dlerror("Unable to link OSSL_PROVIDER_load"); + return(ENOENT); + } + } + + if (providers_loaded == 0) { + if ((legacy = (*ossl_provider_load)(NULL, "legacy")) == NULL) + return (EINVAL); + if ((deflt = (*ossl_provider_load)(NULL, "default")) == NULL) { + (*ossl_provider_unload)(legacy); + return (EINVAL); + } + if (atexit(fbsd_ossl_provider_unload)) { + fbsd_ossl_provider_unload(); + return (errno); + } + providers_loaded = 1; + } +#endif + return (0); +} diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile index 71a38a5729d1..771a7c70d06d 100644 --- a/kerberos5/lib/libsl/Makefile +++ b/kerberos5/lib/libsl/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= sl INTERNALLIB= diff --git a/kerberos5/lib/libsl/Makefile.depend b/kerberos5/lib/libsl/Makefile.depend index bf55d61b327e..57d80642bafe 100644 --- a/kerberos5/lib/libsl/Makefile.depend +++ b/kerberos5/lib/libsl/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile index cef5a88a7461..52f025bc50ab 100644 --- a/kerberos5/lib/libvers/Makefile +++ b/kerberos5/lib/libvers/Makefile @@ -1,4 +1,5 @@ -# $FreeBSD$ + +PACKAGE= kerberos-lib LIB= vers INTERNALLIB= diff --git a/kerberos5/lib/libvers/Makefile.depend b/kerberos5/lib/libvers/Makefile.depend index b6d7d1c18f94..8f4f521e7ecd 100644 --- a/kerberos5/lib/libvers/Makefile.depend +++ b/kerberos5/lib/libvers/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile index 0e4fa4303b98..542ea662515c 100644 --- a/kerberos5/lib/libwind/Makefile +++ b/kerberos5/lib/libwind/Makefile @@ -1,4 +1,5 @@ -#$FreeBSD$ + +PACKAGE= kerberos-lib LIB= wind LDFLAGS= -Wl,--no-undefined diff --git a/kerberos5/lib/libwind/Makefile.depend b/kerberos5/lib/libwind/Makefile.depend index a8c6128acb62..4605702a9cea 100644 --- a/kerberos5/lib/libwind/Makefile.depend +++ b/kerberos5/lib/libwind/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ |