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
@@ -1,89 +1,90 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	gssapi_krb5
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
 LIBADD=	gssapi krb5 crypto roken asn1 com_err
 SHLIB_MAJOR=	10
 
 INCS=	${KRB5DIR}/lib/gssapi/gssapi/gssapi_krb5.h
 INCSDIR= ${INCLUDEDIR}/gssapi
 
 SRCS=	8003.c \
 	accept_sec_context.c \
 	acquire_cred.c \
 	add_cred.c \
 	address_to_krb5addr.c \
 	aeap.c \
 	arcfour.c \
 	authorize_localname.c \
 	canonicalize_name.c \
 	ccache_name.c \
 	cfx.c \
 	compare_name.c \
 	compat.c \
 	context_time.c \
 	copy_ccache.c \
 	creds.c \
 	decapsulate.c \
 	delete_sec_context.c \
 	display_name.c \
 	display_status.c \
 	duplicate_name.c \
 	encapsulate.c \
 	export_name.c \
 	export_sec_context.c \
 	external.c \
 	get_mic.c \
 	gkrb5_err.c \
 	gkrb5_err.h \
 	import_name.c \
 	import_sec_context.c \
 	indicate_mechs.c \
 	init.c \
 	init_sec_context.c \
 	inquire_context.c \
 	inquire_cred.c \
 	inquire_cred_by_mech.c \
 	inquire_cred_by_oid.c \
 	inquire_mechs_for_name.c \
 	inquire_names_for_mech.c \
 	inquire_sec_context_by_oid.c \
 	pname_to_uid.c \
 	prefix.c \
 	prf.c \
 	process_context_token.c \
 	release_buffer.c \
 	release_cred.c \
 	release_name.c \
 	sequence.c \
 	set_cred_option.c \
 	set_sec_context_option.c \
 	store_cred.c \
 	ticket_flags.c \
 	unwrap.c \
 	verify_mic.c \
 	wrap.c \
 	gss_krb5.c \
 	gss_oid.c
 
 #SRCS+=	gss_add_oid_set_member.c \
 #	gss_create_empty_oid_set.c \
 #	gss_release_buffer.c \
 #	gss_release_oid_set.c \
 #	gss_test_oid_set_member.c \
 #	gss_utils.c
 
 CFLAGS+=-I${KRB5DIR}/lib/gssapi
 CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
 CFLAGS+=-I${KRB5DIR}/lib/krb5
 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>
 
 .PATH: ${KRB5DIR}/lib/gssapi/krb5 ${SRCTOP}/lib/libgssapi
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
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	gssapi_ntlm
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
 LIBADD=	crypto gssapi krb5 heimntlm roken
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \
 	acquire_cred.c \
 	add_cred.c \
 	canonicalize_name.c \
 	compare_name.c \
 	context_time.c \
 	creds.c \
 	crypto.c \
 	delete_sec_context.c \
 	display_name.c \
 	display_status.c \
 	duplicate_name.c \
 	export_name.c \
 	export_sec_context.c \
 	external.c \
 	import_name.c \
 	import_sec_context.c \
 	indicate_mechs.c \
 	init_sec_context.c \
 	inquire_context.c \
 	inquire_cred_by_mech.c \
 	inquire_mechs_for_name.c \
 	inquire_names_for_mech.c \
 	inquire_sec_context_by_oid.c \
 	iter_cred.c \
 	kdc.c \
 	prefix.c \
 	process_context_token.c \
 	release_cred.c \
 	release_name.c \
 	gss_oid.c
 
 CFLAGS+=-I${KRB5DIR}/lib/gssapi
 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>
 
 .PATH: ${KRB5DIR}/lib/gssapi/ntlm ${SRCTOP}/lib/libgssapi ${.CURDIR:H}/libgssapi_krb5
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
@@ -1,42 +1,43 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	heimntlm
 LDFLAGS=	-Wl,--no-undefined
 LIBADD=	crypto com_err krb5 roken
 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 \
 	ntlm_core.3 \
 	ntlm_type1.3 \
 	ntlm_type2.3 \
 	ntlm_type3.3
 
 MLINKS=	ntlm_core.3 heim_ntlm_build_ntlm1_master.3 \
 	ntlm_core.3 heim_ntlm_build_ntlm2_master.3 \
 	ntlm_core.3 heim_ntlm_calculate_lm2.3 \
 	ntlm_core.3 heim_ntlm_calculate_ntlm1.3 \
 	ntlm_core.3 heim_ntlm_calculate_ntlm2.3 \
 	ntlm_core.3 heim_ntlm_decode_targetinfo.3 \
 	ntlm_core.3 heim_ntlm_encode_targetinfo.3 \
 	ntlm_core.3 heim_ntlm_encode_type1.3 \
 	ntlm_core.3 heim_ntlm_encode_type2.3 \
 	ntlm_core.3 heim_ntlm_encode_type3.3 \
 	ntlm_core.3 heim_ntlm_free_buf.3 \
 	ntlm_core.3 heim_ntlm_free_targetinfo.3 \
 	ntlm_core.3 heim_ntlm_free_type1.3 \
 	ntlm_core.3 heim_ntlm_free_type2.3 \
 	ntlm_core.3 heim_ntlm_free_type3.3 \
 	ntlm_core.3 heim_ntlm_keyex_unwrap.3 \
 	ntlm_core.3 heim_ntlm_nt_key.3 \
 	ntlm_core.3 heim_ntlm_ntlmv2_key.3 \
 	ntlm_core.3 heim_ntlm_verify_ntlm2.3
 
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/ntlm ${KRB5DIR}/doc/doxyout/ntlm/man/man3
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
@@ -1,304 +1,305 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
 LIBADD=	asn1 com_err crypto roken wind
 
 MAN=	hx509.3 \
 	hx509_ca.3 \
 	hx509_cert.3 \
 	hx509_cms.3 \
 	hx509_crypto.3 \
 	hx509_env.3 \
 	hx509_error.3 \
 	hx509_keyset.3 \
 	hx509_lock.3 \
 	hx509_misc.3 \
 	hx509_name.3 \
 	hx509_peer.3 \
 	hx509_print.3 \
 	hx509_query.3 \
 	hx509_revoke.3 \
 	hx509_verify.3
 
 MLINKS=	hx509.3 hx509_context_free.3 \
 	hx509.3 hx509_context_init.3 \
 	hx509_ca.3 hx509_ca_sign.3 \
 	hx509_ca.3 hx509_ca_sign_self.3 \
 	hx509_ca.3 hx509_ca_tbs_add_crl_dp_uri.3 \
 	hx509_ca.3 hx509_ca_tbs_add_eku.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_hostname.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_jid.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_ms_upn.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_otherName.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_pkinit.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_rfc822name.3 \
 	hx509_ca.3 hx509_ca_tbs_free.3 \
 	hx509_ca.3 hx509_ca_tbs_init.3 \
 	hx509_ca.3 hx509_ca_tbs_set_ca.3 \
 	hx509_ca.3 hx509_ca_tbs_set_domaincontroller.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notAfter.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notAfter_lifetime.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notBefore.3 \
 	hx509_ca.3 hx509_ca_tbs_set_proxy.3 \
 	hx509_ca.3 hx509_ca_tbs_set_serialnumber.3 \
 	hx509_ca.3 hx509_ca_tbs_set_spki.3 \
 	hx509_ca.3 hx509_ca_tbs_set_subject.3 \
 	hx509_ca.3 hx509_ca_tbs_set_template.3 \
 	hx509_ca.3 hx509_ca_tbs_set_unique.3 \
 	hx509_ca.3 hx509_ca_tbs_subject_expand.3 \
 	hx509_ca.3 hx509_ca_tbs_template_units.3 \
 	hx509_cert.3 hx509_cert_binary.3 \
 	hx509_cert.3 hx509_cert_check_eku.3 \
 	hx509_cert.3 hx509_cert_cmp.3 \
 	hx509_cert.3 hx509_cert_find_subjectAltName_otherName.3 \
 	hx509_cert.3 hx509_cert_free.3 \
 	hx509_cert.3 hx509_cert_get_SPKI.3 \
 	hx509_cert.3 hx509_cert_get_SPKI_AlgorithmIdentifier.3 \
 	hx509_cert.3 hx509_cert_get_attribute.3 \
 	hx509_cert.3 hx509_cert_get_base_subject.3 \
 	hx509_cert.3 hx509_cert_get_friendly_name.3 \
 	hx509_cert.3 hx509_cert_get_issuer.3 \
 	hx509_cert.3 hx509_cert_get_issuer_unique_id.3 \
 	hx509_cert.3 hx509_cert_get_notAfter.3 \
 	hx509_cert.3 hx509_cert_get_notBefore.3 \
 	hx509_cert.3 hx509_cert_get_serialnumber.3 \
 	hx509_cert.3 hx509_cert_get_subject.3 \
 	hx509_cert.3 hx509_cert_get_subject_unique_id.3 \
 	hx509_cert.3 hx509_cert_init.3 \
 	hx509_cert.3 hx509_cert_init_data.3 \
 	hx509_cert.3 hx509_cert_ref.3 \
 	hx509_cert.3 hx509_cert_set_friendly_name.3 \
 	hx509_cert.3 hx509_print_cert.3 \
 	hx509_cert.3 hx509_query_alloc.3 \
 	hx509_cert.3 hx509_query_free.3 \
 	hx509_cert.3 hx509_query_match_cmp_func.3 \
 	hx509_cert.3 hx509_query_match_eku.3 \
 	hx509_cert.3 hx509_query_match_friendly_name.3 \
 	hx509_cert.3 hx509_query_match_issuer_serial.3 \
 	hx509_cert.3 hx509_query_match_option.3 \
 	hx509_cert.3 hx509_query_statistic_file.3 \
 	hx509_cert.3 hx509_query_unparse_stats.3 \
 	hx509_cert.3 hx509_verify_ctx_f_allow_default_trustanchors.3 \
 	hx509_cert.3 hx509_verify_hostname.3 \
 	hx509_cms.3 hx509_cms_create_signed_1.3 \
 	hx509_cms.3 hx509_cms_envelope_1.3 \
 	hx509_cms.3 hx509_cms_unenvelope.3 \
 	hx509_cms.3 hx509_cms_unwrap_ContentInfo.3 \
 	hx509_cms.3 hx509_cms_verify_signed.3 \
 	hx509_cms.3 hx509_cms_wrap_ContentInfo.3 \
 	hx509_crypto.3 hx509_verify_signature.3 \
 	hx509_env.3 hx509_env_add.3 \
 	hx509_env.3 hx509_env_add_binding.3 \
 	hx509_env.3 hx509_env_find.3 \
 	hx509_env.3 hx509_env_find_binding.3 \
 	hx509_env.3 hx509_env_free.3 \
 	hx509_env.3 hx509_env_lfind.3 \
 	hx509_error.3 hx509_clear_error_string.3 \
 	hx509_error.3 hx509_err.3 \
 	hx509_error.3 hx509_free_error_string.3 \
 	hx509_error.3 hx509_get_error_string.3 \
 	hx509_error.3 hx509_set_error_string.3 \
 	hx509_error.3 hx509_set_error_stringv.3 \
 	hx509_keyset.3 hx509_certs_add.3 \
 	hx509_keyset.3 hx509_certs_append.3 \
 	hx509_keyset.3 hx509_certs_end_seq.3 \
 	hx509_keyset.3 hx509_certs_filter.3 \
 	hx509_keyset.3 hx509_certs_find.3 \
 	hx509_keyset.3 hx509_certs_free.3 \
 	hx509_keyset.3 hx509_certs_info.3 \
 	hx509_keyset.3 hx509_certs_init.3 \
 	hx509_keyset.3 hx509_certs_iter_f.3 \
 	hx509_keyset.3 hx509_certs_merge.3 \
 	hx509_keyset.3 hx509_certs_next_cert.3 \
 	hx509_keyset.3 hx509_certs_start_seq.3 \
 	hx509_keyset.3 hx509_certs_store.3 \
 	hx509_keyset.3 hx509_ci_print_names.3 \
 	hx509_keyset.3 hx509_get_one_cert.3 \
 	hx509_misc.3 hx509_free_octet_string_list.3 \
 	hx509_misc.3 hx509_xfree.3 \
 	hx509_name.3 hx509_general_name_unparse.3 \
 	hx509_name.3 hx509_name_binary.3 \
 	hx509_name.3 hx509_name_cmp.3 \
 	hx509_name.3 hx509_name_copy.3 \
 	hx509_name.3 hx509_name_expand.3 \
 	hx509_name.3 hx509_name_free.3 \
 	hx509_name.3 hx509_name_is_null_p.3 \
 	hx509_name.3 hx509_name_to_Name.3 \
 	hx509_name.3 hx509_name_to_string.3 \
 	hx509_name.3 hx509_parse_name.3 \
 	hx509_name.3 hx509_unparse_der_name.3 \
 	hx509_peer.3 hx509_peer_info_add_cms_alg.3 \
 	hx509_peer.3 hx509_peer_info_alloc.3 \
 	hx509_peer.3 hx509_peer_info_free.3 \
 	hx509_peer.3 hx509_peer_info_set_cert.3 \
 	hx509_peer.3 hx509_peer_info_set_cms_algs.3 \
 	hx509_print.3 hx509_bitstring_print.3 \
 	hx509_print.3 hx509_cert_keyusage_print.3 \
 	hx509_print.3 hx509_oid_print.3 \
 	hx509_print.3 hx509_oid_sprint.3 \
 	hx509_print.3 hx509_print_stdout.3 \
 	hx509_print.3 hx509_validate_cert.3 \
 	hx509_print.3 hx509_validate_ctx_add_flags.3 \
 	hx509_print.3 hx509_validate_ctx_free.3 \
 	hx509_print.3 hx509_validate_ctx_init.3 \
 	hx509_print.3 hx509_validate_ctx_set_print.3 \
 	hx509_revoke.3 hx509_ocsp_request.3 \
 	hx509_revoke.3 hx509_revoke_add_crl.3 \
 	hx509_revoke.3 hx509_revoke_add_ocsp.3 \
 	hx509_revoke.3 hx509_revoke_free.3 \
 	hx509_revoke.3 hx509_revoke_init.3 \
 	hx509_revoke.3 hx509_revoke_ocsp_print.3 \
 	hx509_revoke.3 hx509_revoke_verify.3 \
 	hx509_verify.3 hx509_context_set_missing_revoke.3 \
 	hx509_verify.3 hx509_crl_add_revoked_certs.3 \
 	hx509_verify.3 hx509_crl_alloc.3 \
 	hx509_verify.3 hx509_crl_free.3 \
 	hx509_verify.3 hx509_crl_lifetime.3 \
 	hx509_verify.3 hx509_crl_sign.3 \
 	hx509_verify.3 hx509_ocsp_verify.3 \
 	hx509_verify.3 hx509_verify_attach_anchors.3 \
 	hx509_verify.3 hx509_verify_attach_revoke.3 \
 	hx509_verify.3 hx509_verify_destroy_ctx.3 \
 	hx509_verify.3 hx509_verify_init_ctx.3 \
 	hx509_verify.3 hx509_verify_path.3 \
 	hx509_verify.3 hx509_verify_set_max_depth.3 \
 	hx509_verify.3 hx509_verify_set_proxy_certificate.3 \
 	hx509_verify.3 hx509_verify_set_strict_rfc3280_verification.3 \
 	hx509_verify.3 hx509_verify_set_time.3
 
 INCS=	hx509-private.h \
 	hx509-protos.h \
 	hx509.h \
 	hx509_err.h
 
 SRCS=	ca.c \
 	cert.c \
 	cms.c \
 	collector.c \
 	crypto.c \
 	doxygen.c \
 	error.c \
 	env.c \
 	file.c \
 	sel.c \
 	sel-gram.y \
 	sel-lex.l \
 	keyset.c \
 	ks_dir.c \
 	ks_file.c \
 	ks_mem.c \
 	ks_null.c \
 	ks_p11.c \
 	ks_p12.c \
 	ks_keychain.c \
 	lock.c \
 	name.c \
 	peer.c \
 	print.c \
 	softp11.c \
 	req.c \
 	revoke.c
 
 SRCS+=	hx509_err.c \
 	hx509_err.h
 
 SRCS+=	${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \
 	${GEN_PKCS10:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
 CFLAGS+=-I${KRB5DIR}/lib/asn1
 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 \
 	asn1_OCSPCertID.x \
 	asn1_OCSPCertStatus.x \
 	asn1_OCSPInnerRequest.x \
 	asn1_OCSPKeyHash.x \
 	asn1_OCSPRequest.x \
 	asn1_OCSPResponderID.x \
 	asn1_OCSPResponse.x \
 	asn1_OCSPResponseBytes.x \
 	asn1_OCSPResponseData.x \
 	asn1_OCSPResponseStatus.x \
 	asn1_OCSPSignature.x \
 	asn1_OCSPSingleResponse.x \
 	asn1_OCSPTBSRequest.x \
 	asn1_OCSPVersion.x \
 	asn1_id_pkix_ocsp.x \
 	asn1_id_pkix_ocsp_basic.x \
 	asn1_id_pkix_ocsp_nonce.x \
 	ocsp_asn1.hx \
 	ocsp_asn1-priv.hx
 
 GEN_PKCS10= \
 	asn1_CertificationRequestInfo.x \
 	asn1_CertificationRequest.x \
 	pkcs10_asn1.hx \
 	pkcs10_asn1-priv.hx
 
 GEN_CRMF= \
 	asn1_CRMFRDNSequence.x \
 	asn1_CertReqMessages.x \
 	asn1_CertReqMsg.x \
 	asn1_CertRequest.x \
 	asn1_CertTemplate.x \
 	asn1_Controls.x \
 	asn1_PBMParameter.x \
 	asn1_PKMACValue.x \
 	asn1_POPOPrivKey.x \
 	asn1_POPOSigningKey.x \
 	asn1_POPOSigningKeyInput.x \
 	asn1_ProofOfPossession.x \
 	asn1_SubsequentMessage.x \
 	crmf_asn1.hx \
 	crmf_asn1-priv.hx
 
 GEN+=	${GEN_OCSP}
 GEN+=	${GEN_PKCS10}
 GEN+=	${GEN_CRMF}
 
 CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \
 	pkcs10_asn1_files crmf_asn1_files ocsp_asn1-template.[ch]* \
 	pkcs10_asn1-template.[ch]* crmf_asn1-template.[ch]*
 
 INCS+=	ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h
 
 .ORDER: ${GEN_OCSP}
 ${GEN_OCSP:[2..-1]}: .NOMETA
 ${GEN_OCSP}: ocsp.asn1 ocsp.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	 ${.ALLSRC:M*.asn1} ocsp_asn1
 
 .ORDER: ${GEN_PKCS10}
 ${GEN_PKCS10:[2..-1]}: .NOMETA
 ${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	${.ALLSRC:M*.asn1} pkcs10_asn1
 
 .ORDER: ${GEN_CRMF}
 ${GEN_CRMF:[2..-1]}: .NOMETA
 ${GEN_CRMF}: crmf.asn1
 	${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
 	${CP} ${.IMPSRC} ${.TARGET}
 
 .hx.h:
 	${CP} ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/hx509 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/doc/doxyout/hx509/man/man3
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
@@ -1,38 +1,39 @@
 #$FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	kdc
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/kdc/version-script.map
 LIBADD=	roken hdb hx509 krb5 heimntlm asn1 crypto
 
 INCS=	kdc.h \
 	kdc-protos.h
 
 KRB5INCS=	windc_plugin.h
 KRB5INCSDIR=	${INCLUDEDIR}/krb5
 INCSGROUPS=	INCS KRB5INCS
 
 SRCS=	\
 	default_config.c \
 	set_dbinfo.c \
 	digest.c \
 	kerberos5.c \
 	krb5tgs.c \
 	pkinit.c \
 	log.c \
 	misc.c \
 	kx509.c \
 	process.c \
 	windc.c
 
 CFLAGS+=	-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/hdb \
 		-I${KRB5DIR}/kdc \
 		-I${SRCTOP}/contrib/com_err
+CFLAGS+=	-DOPENSSL_API_COMPAT=0x10100000L
 
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/kdc
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
@@ -1,632 +1,633 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos-lib
 
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
 LIBADD=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
 
 INCS=	heim_err.h \
 	heim_threads.h \
 	k524_err.h \
 	krb5-protos.h \
 	krb5-private.h \
 	krb5-types.h \
 	krb5.h \
 	krb5_err.h \
 	krb5_ccapi.h
 
 KRB5INCS=	locate_plugin.h \
 		send_to_kdc_plugin.h \
 		ccache_plugin.h
 KRB5INCSDIR=	${INCLUDEDIR}/krb5
 INCSGROUPS=	INCS KRB5INCS
 
 MAN=	krb5.3 \
 	krb524_convert_creds_kdc.3 \
 	krb5_425_conv_principal.3 \
 	krb5_acl_match_file.3 \
 	krb5_address.3 \
 	krb5_aname_to_localname.3 \
 	krb5_appdefault.3 \
 	krb5_auth.3 \
 	krb5_auth_context.3 \
 	krb5_c_make_checksum.3 \
 	krb5_ccache.3 \
 	krb5_ccache_intro.3 \
 	krb5_check_transited.3 \
 	krb5_create_checksum.3 \
 	krb5_credential.3 \
 	krb5_creds.3 \
 	krb5_crypto.3 \
 	krb5_crypto_iov.3 \
 	krb5_deprecated.3 \
 	krb5_digest.3 \
 	krb5_eai_to_heim_errno.3 \
 	krb5_encrypt.3 \
 	krb5_error.3 \
 	krb5_fileformats.3 \
 	krb5_find_padata.3 \
 	krb5_generate_random_block.3 \
 	krb5_get_all_client_addrs.3 \
 	krb5_get_credentials.3 \
 	krb5_get_creds.3 \
 	krb5_get_forwarded_creds.3 \
 	krb5_get_in_cred.3 \
 	krb5_get_init_creds.3 \
 	krb5_get_krbhst.3 \
 	krb5_getportbyname.3 \
 	krb5_init_context.3 \
 	krb5_init_creds_intro.3 \
 	krb5_introduction.3 \
 	krb5_is_thread_safe.3 \
 	krb5_keytab.3 \
 	krb5_keytab_intro.3 \
 	krb5_krbhst_init.3 \
 	krb5_mk_req.3 \
 	krb5_mk_safe.3 \
 	krb5_openlog.3 \
 	krb5_pac.3 \
 	krb5_parse_name.3 \
 	krb5_principal.3 \
 	krb5_principal_intro.3 \
 	krb5_rcache.3 \
 	krb5_rd_error.3 \
 	krb5_rd_safe.3 \
 	krb5_set_default_realm.3 \
 	krb5_set_password.3 \
 	krb5_storage.3 \
 	krb5_string_to_key.3 \
 	krb5_support.3 \
 	krb5_ticket.3 \
 	krb5_timeofday.3 \
 	krb5_v4compat.3 \
 	krb5_verify_init_creds.3 \
 	krb5_verify_user.3
 
 MAN+=	krb5.conf.5
 MAN+=	kerberos.8
 
 MLINKS=	krb5.3 krb5_add_et_list.3 \
 	krb5.3 krb5_add_extra_addresses.3 \
 	krb5.3 krb5_add_ignore_addresses.3 \
 	krb5.3 krb5_compare_creds.3 \
 	krb5.3 krb5_copy_context.3 \
 	krb5.3 krb5_copy_creds.3 \
 	krb5.3 krb5_copy_creds_contents.3 \
 	krb5.3 krb5_copy_data.3 \
 	krb5.3 krb5_copy_host_realm.3 \
 	krb5.3 krb5_copy_ticket.3 \
 	krb5.3 krb5_creds_get_ticket_flags.3 \
 	krb5.3 krb5_data_alloc.3 \
 	krb5.3 krb5_data_cmp.3 \
 	krb5.3 krb5_data_copy.3 \
 	krb5.3 krb5_data_ct_cmp.3 \
 	krb5.3 krb5_data_free.3 \
 	krb5.3 krb5_data_realloc.3 \
 	krb5.3 krb5_data_zero.3 \
 	krb5.3 krb5_free_config_files.3 \
 	krb5.3 krb5_free_cred_contents.3 \
 	krb5.3 krb5_free_creds.3 \
 	krb5.3 krb5_free_data.3 \
 	krb5.3 krb5_free_ticket.3 \
 	krb5.3 krb5_get_default_config_files.3 \
 	krb5.3 krb5_get_default_in_tkt_etypes.3 \
 	krb5.3 krb5_get_dns_canonicalize_hostname.3 \
 	krb5.3 krb5_get_extra_addresses.3 \
 	krb5.3 krb5_get_fcache_version.3 \
 	krb5.3 krb5_get_ignore_addresses.3 \
 	krb5.3 krb5_get_kdc_sec_offset.3 \
 	krb5.3 krb5_get_max_time_skew.3 \
 	krb5.3 krb5_get_use_admin_kdc.3 \
 	krb5.3 krb5_init_ets.3 \
 	krb5.3 krb5_kerberos_enctypes.3 \
 	krb5.3 krb5_prepend_config_files_default.3 \
 	krb5.3 krb5_set_config_files.3 \
 	krb5.3 krb5_set_default_in_tkt_etypes.3 \
 	krb5.3 krb5_set_dns_canonicalize_hostname.3 \
 	krb5.3 krb5_set_extra_addresses.3 \
 	krb5.3 krb5_set_fcache_version.3 \
 	krb5.3 krb5_set_home_dir_access.3 \
 	krb5.3 krb5_set_ignore_addresses.3 \
 	krb5.3 krb5_set_kdc_sec_offset.3 \
 	krb5.3 krb5_set_max_time_skew.3 \
 	krb5.3 krb5_set_real_time.3 \
 	krb5.3 krb5_set_use_admin_kdc.3 \
 	krb5.3 krb5_ticket_get_authorization_data_type.3 \
 	krb5.3 krb5_ticket_get_client.3 \
 	krb5.3 krb5_ticket_get_endtime.3 \
 	krb5.3 krb5_ticket_get_server.3 \
 	krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3 \
 	krb5_425_conv_principal.3 krb5_524_conv_principal.3 \
 	krb5_address.3 krb5_addr2sockaddr.3 \
 	krb5_address.3 krb5_address_compare.3 \
 	krb5_address.3 krb5_address_order.3 \
 	krb5_address.3 krb5_address_prefixlen_boundary.3 \
 	krb5_address.3 krb5_address_search.3 \
 	krb5_address.3 krb5_anyaddr.3 \
 	krb5_address.3 krb5_append_addresses.3 \
 	krb5_address.3 krb5_copy_address.3 \
 	krb5_address.3 krb5_copy_addresses.3 \
 	krb5_address.3 krb5_free_address.3 \
 	krb5_address.3 krb5_free_addresses.3 \
 	krb5_address.3 krb5_h_addr2addr.3 \
 	krb5_address.3 krb5_h_addr2sockaddr.3 \
 	krb5_address.3 krb5_make_addrport.3 \
 	krb5_address.3 krb5_max_sockaddr_size.3 \
 	krb5_address.3 krb5_parse_address.3 \
 	krb5_address.3 krb5_print_address.3 \
 	krb5_address.3 krb5_sockaddr2address.3 \
 	krb5_address.3 krb5_sockaddr2port.3 \
 	krb5_address.3 krb5_sockaddr_uninteresting.3 \
 	krb5_appdefault.3 krb5_appdefault_boolean.3 \
 	krb5_appdefault.3 krb5_appdefault_string.3 \
 	krb5_appdefault.3 krb5_appdefault_time.3 \
 	krb5_auth.3 krb5_rd_req_ctx.3 \
 	krb5_auth.3 krb5_rd_req_in_ctx_alloc.3 \
 	krb5_auth.3 krb5_rd_req_in_set_keytab.3 \
 	krb5_auth.3 krb5_rd_req_in_set_pac_check.3 \
 	krb5_auth.3 krb5_rd_req_out_ctx_free.3 \
 	krb5_auth.3 krb5_rd_req_out_get_server.3 \
 	krb5_auth_context.3 krb5_auth_con_free.3 \
 	krb5_auth_context.3 krb5_auth_con_genaddrs.3 \
 	krb5_auth_context.3 krb5_auth_con_getaddrs.3 \
 	krb5_auth_context.3 krb5_auth_con_getflags.3 \
 	krb5_auth_context.3 krb5_auth_con_getkey.3 \
 	krb5_auth_context.3 krb5_auth_con_getlocalsubkey.3 \
 	krb5_auth_context.3 krb5_auth_con_getrcache.3 \
 	krb5_auth_context.3 krb5_auth_con_getremotesubkey.3 \
 	krb5_auth_context.3 krb5_auth_con_getuserkey.3 \
 	krb5_auth_context.3 krb5_auth_con_init.3 \
 	krb5_auth_context.3 krb5_auth_con_initivector.3 \
 	krb5_auth_context.3 krb5_auth_con_setaddrs.3 \
 	krb5_auth_context.3 krb5_auth_con_setaddrs_from_fd.3 \
 	krb5_auth_context.3 krb5_auth_con_setflags.3 \
 	krb5_auth_context.3 krb5_auth_con_setivector.3 \
 	krb5_auth_context.3 krb5_auth_con_setkey.3 \
 	krb5_auth_context.3 krb5_auth_con_setlocalsubkey.3 \
 	krb5_auth_context.3 krb5_auth_con_setrcache.3 \
 	krb5_auth_context.3 krb5_auth_con_setremotesubkey.3 \
 	krb5_auth_context.3 krb5_auth_con_setuserkey.3 \
 	krb5_auth_context.3 krb5_auth_getauthenticator.3 \
 	krb5_auth_context.3 krb5_auth_getcksumtype.3 \
 	krb5_auth_context.3 krb5_auth_getkeytype.3 \
 	krb5_auth_context.3 krb5_auth_getlocalseqnumber.3 \
 	krb5_auth_context.3 krb5_auth_setcksumtype.3 \
 	krb5_auth_context.3 krb5_auth_setkeytype.3 \
 	krb5_auth_context.3 krb5_auth_setlocalseqnumber.3 \
 	krb5_auth_context.3 krb5_auth_setremoteseqnumber.3 \
 	krb5_ccache.3 krb5_acc_ops.3 \
 	krb5_ccache.3 krb5_cc_cache_end_seq_get.3 \
 	krb5_ccache.3 krb5_cc_cache_get_first.3 \
 	krb5_ccache.3 krb5_cc_cache_match.3 \
 	krb5_ccache.3 krb5_cc_cache_next.3 \
 	krb5_ccache.3 krb5_cc_clear_mcred.3 \
 	krb5_ccache.3 krb5_cc_close.3 \
 	krb5_ccache.3 krb5_cc_copy_cache.3 \
 	krb5_ccache.3 krb5_cc_copy_creds.3 \
 	krb5_ccache.3 krb5_cc_copy_match_f.3 \
 	krb5_ccache.3 krb5_cc_default.3 \
 	krb5_ccache.3 krb5_cc_default_name.3 \
 	krb5_ccache.3 krb5_cc_destroy.3 \
 	krb5_ccache.3 krb5_cc_end_seq_get.3 \
 	krb5_ccache.3 krb5_cc_gen_new.3 \
 	krb5_ccache.3 krb5_cc_get_config.3 \
 	krb5_ccache.3 krb5_cc_get_flags.3 \
 	krb5_ccache.3 krb5_cc_get_friendly_name.3 \
 	krb5_ccache.3 krb5_cc_get_full_name.3 \
 	krb5_ccache.3 krb5_cc_get_kdc_offset.3 \
 	krb5_ccache.3 krb5_cc_get_lifetime.3 \
 	krb5_ccache.3 krb5_cc_get_name.3 \
 	krb5_ccache.3 krb5_cc_get_ops.3 \
 	krb5_ccache.3 krb5_cc_get_prefix_ops.3 \
 	krb5_ccache.3 krb5_cc_get_principal.3 \
 	krb5_ccache.3 krb5_cc_get_type.3 \
 	krb5_ccache.3 krb5_cc_get_version.3 \
 	krb5_ccache.3 krb5_cc_initialize.3 \
 	krb5_ccache.3 krb5_cc_last_change_time.3 \
 	krb5_ccache.3 krb5_cc_move.3 \
 	krb5_ccache.3 krb5_cc_new_unique.3 \
 	krb5_ccache.3 krb5_cc_next_cred.3 \
 	krb5_ccache.3 krb5_cc_register.3 \
 	krb5_ccache.3 krb5_cc_remove_cred.3 \
 	krb5_ccache.3 krb5_cc_resolve.3 \
 	krb5_ccache.3 krb5_cc_retrieve_cred.3 \
 	krb5_ccache.3 krb5_cc_set_config.3 \
 	krb5_ccache.3 krb5_cc_set_default_name.3 \
 	krb5_ccache.3 krb5_cc_set_flags.3 \
 	krb5_ccache.3 krb5_cc_set_friendly_name.3 \
 	krb5_ccache.3 krb5_cc_set_kdc_offset.3 \
 	krb5_ccache.3 krb5_cc_start_seq_get.3 \
 	krb5_ccache.3 krb5_cc_store_cred.3 \
 	krb5_ccache.3 krb5_cc_support_switch.3 \
 	krb5_ccache.3 krb5_cc_switch.3 \
 	krb5_ccache.3 krb5_cccol_cursor_free.3 \
 	krb5_ccache.3 krb5_cccol_cursor_new.3 \
 	krb5_ccache.3 krb5_cccol_cursor_next.3 \
 	krb5_ccache.3 krb5_cccol_last_change_time.3 \
 	krb5_ccache.3 krb5_fcc_ops.3 \
 	krb5_ccache.3 krb5_get_validated_creds.3 \
 	krb5_ccache.3 krb5_is_config_principal.3 \
 	krb5_ccache.3 krb5_mcc_ops.3 \
 	krb5_create_checksum.3 krb5_checksum_is_collision_proof.3 \
 	krb5_create_checksum.3 krb5_checksum_is_keyed.3 \
 	krb5_create_checksum.3 krb5_checksumsize.3 \
 	krb5_create_checksum.3 krb5_verify_checksum.3 \
 	krb5_credential.3 krb5_fwd_tgt_creds.3 \
 	krb5_credential.3 krb5_get_init_creds_keyblock.3 \
 	krb5_credential.3 krb5_get_init_creds_keytab.3 \
 	krb5_credential.3 krb5_get_init_creds_opt_alloc.3 \
 	krb5_credential.3 krb5_get_init_creds_opt_free.3 \
 	krb5_credential.3 krb5_get_init_creds_password.3 \
 	krb5_credential.3 krb5_init_creds_free.3 \
 	krb5_credential.3 krb5_init_creds_get.3 \
 	krb5_credential.3 krb5_init_creds_get_error.3 \
 	krb5_credential.3 krb5_init_creds_init.3 \
 	krb5_credential.3 krb5_init_creds_set_keytab.3 \
 	krb5_credential.3 krb5_init_creds_set_password.3 \
 	krb5_credential.3 krb5_init_creds_set_service.3 \
 	krb5_credential.3 krb5_init_creds_step.3 \
 	krb5_crypto.3 krb5_allow_weak_crypto.3 \
 	krb5_crypto.3 krb5_cksumtype_to_enctype.3 \
 	krb5_crypto.3 krb5_copy_keyblock.3 \
 	krb5_crypto.3 krb5_copy_keyblock_contents.3 \
 	krb5_crypto.3 krb5_create_checksum_iov.3 \
 	krb5_crypto.3 krb5_crypto_destroy.3 \
 	krb5_crypto.3 krb5_crypto_fx_cf2.3 \
 	krb5_crypto.3 krb5_crypto_getblocksize.3 \
 	krb5_crypto.3 krb5_crypto_getconfoundersize.3 \
 	krb5_crypto.3 krb5_crypto_getenctype.3 \
 	krb5_crypto.3 krb5_crypto_getpadsize.3 \
 	krb5_crypto.3 krb5_crypto_init.3 \
 	krb5_crypto.3 krb5_decrypt_iov_ivec.3 \
 	krb5_crypto.3 krb5_encrypt_iov_ivec.3 \
 	krb5_crypto.3 krb5_enctype_disable.3 \
 	krb5_crypto.3 krb5_enctype_enable.3 \
 	krb5_crypto.3 krb5_enctype_valid.3 \
 	krb5_crypto.3 krb5_free_keyblock.3 \
 	krb5_crypto.3 krb5_free_keyblock_contents.3 \
 	krb5_crypto.3 krb5_generate_subkey_extended.3 \
 	krb5_crypto.3 krb5_keyblock_get_enctype.3 \
 	krb5_crypto.3 krb5_keyblock_init.3 \
 	krb5_crypto.3 krb5_keyblock_zero.3 \
 	krb5_crypto.3 krb5_random_to_key.3 \
 	krb5_crypto.3 krb5_verify_checksum_iov.3 \
 	krb5_deprecated.3 krb5_auth_getremoteseqnumber.3 \
 	krb5_deprecated.3 krb5_c_enctype_compare.3 \
 	krb5_deprecated.3 krb5_change_password.3 \
 	krb5_deprecated.3 krb5_clear_error_string.3 \
 	krb5_deprecated.3 krb5_config_parse_string_multi.3 \
 	krb5_deprecated.3 krb5_enctypes_compatible_keys.3 \
 	krb5_deprecated.3 krb5_free_creds_contents.3 \
 	krb5_deprecated.3 krb5_free_data_contents.3 \
 	krb5_deprecated.3 krb5_free_error_string.3 \
 	krb5_deprecated.3 krb5_free_unparsed_name.3 \
 	krb5_deprecated.3 krb5_generate_subkey.3 \
 	krb5_deprecated.3 krb5_get_cred_from_kdc.3 \
 	krb5_deprecated.3 krb5_get_cred_from_kdc_opt.3 \
 	krb5_deprecated.3 krb5_get_in_tkt_with_keytab.3 \
 	krb5_deprecated.3 krb5_get_in_tkt_with_password.3 \
 	krb5_deprecated.3 krb5_get_in_tkt_with_skey.3 \
 	krb5_deprecated.3 krb5_get_init_creds_opt_get_error.3 \
 	krb5_deprecated.3 krb5_get_init_creds_opt_init.3 \
 	krb5_deprecated.3 krb5_keytab_key_proc.3 \
 	krb5_deprecated.3 krb5_keytype_to_enctypes.3 \
 	krb5_deprecated.3 krb5_keytype_to_enctypes_default.3 \
 	krb5_deprecated.3 krb5_keytype_to_string.3 \
 	krb5_deprecated.3 krb5_password_key_proc.3 \
 	krb5_deprecated.3 krb5_princ_realm.3 \
 	krb5_deprecated.3 krb5_princ_set_realm.3 \
 	krb5_deprecated.3 krb5_set_error_string.3 \
 	krb5_deprecated.3 krb5_string_to_keytype.3 \
 	krb5_deprecated.3 krb5_vset_error_string.3 \
 	krb5_digest.3 krb5_digest_probe.3 \
 	krb5_encrypt.3 krb5_decrypt.3 \
 	krb5_encrypt.3 krb5_decrypt_EncryptedData.3 \
 	krb5_encrypt.3 krb5_encrypt_EncryptedData.3 \
 	krb5_error.3 krb5_clear_error_message.3 \
 	krb5_error.3 krb5_h_errno_to_heim_errno.3 \
 	krb5_error.3 krb5_set_error_message.3 \
 	krb5_error.3 krb5_vwarn.3 \
 	krb5_get_all_client_addrs.3 krb5_get_all_server_addrs.3 \
 	krb5_get_krbhst.3 krb5_free_krbhst.3 \
 	krb5_get_krbhst.3 krb5_get_krb524hst.3 \
 	krb5_get_krbhst.3 krb5_get_krb_admin_hst.3 \
 	krb5_get_krbhst.3 krb5_get_krb_changepw_hst.3 \
 	krb5_init_context.3 krb5_free_context.3 \
 	krb5_keytab.3 krb5_kt_add_entry.3 \
 	krb5_keytab.3 krb5_kt_close.3 \
 	krb5_keytab.3 krb5_kt_compare.3 \
 	krb5_keytab.3 krb5_kt_copy_entry_contents.3 \
 	krb5_keytab.3 krb5_kt_default.3 \
 	krb5_keytab.3 krb5_kt_default_modify_name.3 \
 	krb5_keytab.3 krb5_kt_default_name.3 \
 	krb5_keytab.3 krb5_kt_destroy.3 \
 	krb5_keytab.3 krb5_kt_end_seq_get.3 \
 	krb5_keytab.3 krb5_kt_free_entry.3 \
 	krb5_keytab.3 krb5_kt_get_entry.3 \
 	krb5_keytab.3 krb5_kt_get_full_name.3 \
 	krb5_keytab.3 krb5_kt_get_name.3 \
 	krb5_keytab.3 krb5_kt_get_type.3 \
 	krb5_keytab.3 krb5_kt_have_content.3 \
 	krb5_keytab.3 krb5_kt_next_entry.3 \
 	krb5_keytab.3 krb5_kt_read_service_key.3 \
 	krb5_keytab.3 krb5_kt_register.3 \
 	krb5_keytab.3 krb5_kt_remove_entry.3 \
 	krb5_keytab.3 krb5_kt_resolve.3 \
 	krb5_keytab.3 krb5_kt_start_seq_get.3 \
 	krb5_krbhst_init.3 krb5_krbhst_format_string.3 \
 	krb5_krbhst_init.3 krb5_krbhst_free.3 \
 	krb5_krbhst_init.3 krb5_krbhst_get_addrinfo.3 \
 	krb5_krbhst_init.3 krb5_krbhst_next.3 \
 	krb5_krbhst_init.3 krb5_krbhst_next_as_string.3 \
 	krb5_krbhst_init.3 krb5_krbhst_reset.3 \
 	krb5_openlog.3 krb5_addlog_dest.3 \
 	krb5_openlog.3 krb5_addlog_func.3 \
 	krb5_openlog.3 krb5_closelog.3 \
 	krb5_openlog.3 krb5_initlog.3 \
 	krb5_openlog.3 krb5_log.3 \
 	krb5_openlog.3 krb5_log_msg.3 \
 	krb5_openlog.3 krb5_vlog.3 \
 	krb5_openlog.3 krb5_vlog_msg.3 \
 	krb5_pac.3 krb5_pac_get_buffer.3 \
 	krb5_pac.3 krb5_pac_verify.3 \
 	krb5_principal.3 krb5_build_principal.3 \
 	krb5_principal.3 krb5_build_principal_ext.3 \
 	krb5_principal.3 krb5_build_principal_va.3 \
 	krb5_principal.3 krb5_build_principal_va_ext.3 \
 	krb5_principal.3 krb5_copy_principal.3 \
 	krb5_principal.3 krb5_free_principal.3 \
 	krb5_principal.3 krb5_get_default_principal.3 \
 	krb5_principal.3 krb5_make_principal.3 \
 	krb5_principal.3 krb5_parse_name_flags.3 \
 	krb5_principal.3 krb5_parse_nametype.3 \
 	krb5_principal.3 krb5_principal_compare.3 \
 	krb5_principal.3 krb5_principal_compare_any_realm.3 \
 	krb5_principal.3 krb5_principal_get_comp_string.3 \
 	krb5_principal.3 krb5_principal_get_num_comp.3 \
 	krb5_principal.3 krb5_principal_get_realm.3 \
 	krb5_principal.3 krb5_principal_get_type.3 \
 	krb5_principal.3 krb5_principal_is_krbtgt.3 \
 	krb5_principal.3 krb5_principal_match.3 \
 	krb5_principal.3 krb5_principal_set_realm.3 \
 	krb5_principal.3 krb5_principal_set_type.3 \
 	krb5_principal.3 krb5_realm_compare.3 \
 	krb5_principal.3 krb5_sname_to_principal.3 \
 	krb5_principal.3 krb5_sock_to_principal.3 \
 	krb5_principal.3 krb5_unparse_name.3 \
 	krb5_principal.3 krb5_unparse_name_fixed.3 \
 	krb5_principal.3 krb5_unparse_name_fixed_flags.3 \
 	krb5_principal.3 krb5_unparse_name_fixed_short.3 \
 	krb5_principal.3 krb5_unparse_name_flags.3 \
 	krb5_principal.3 krb5_unparse_name_short.3 \
 	krb5_set_default_realm.3 krb5_free_host_realm.3 \
 	krb5_set_default_realm.3 krb5_get_default_realm.3 \
 	krb5_set_default_realm.3 krb5_get_default_realms.3 \
 	krb5_set_default_realm.3 krb5_get_host_realm.3 \
 	krb5_storage.3 krb5_ret_address.3 \
 	krb5_storage.3 krb5_ret_addrs.3 \
 	krb5_storage.3 krb5_ret_authdata.3 \
 	krb5_storage.3 krb5_ret_creds.3 \
 	krb5_storage.3 krb5_ret_creds_tag.3 \
 	krb5_storage.3 krb5_ret_data.3 \
 	krb5_storage.3 krb5_ret_int16.3 \
 	krb5_storage.3 krb5_ret_int32.3 \
 	krb5_storage.3 krb5_ret_int8.3 \
 	krb5_storage.3 krb5_ret_keyblock.3 \
 	krb5_storage.3 krb5_ret_principal.3 \
 	krb5_storage.3 krb5_ret_string.3 \
 	krb5_storage.3 krb5_ret_stringz.3 \
 	krb5_storage.3 krb5_ret_times.3 \
 	krb5_storage.3 krb5_ret_uint16.3 \
 	krb5_storage.3 krb5_ret_uint32.3 \
 	krb5_storage.3 krb5_ret_uint8.3 \
 	krb5_storage.3 krb5_storage_clear_flags.3 \
 	krb5_storage.3 krb5_storage_emem.3 \
 	krb5_storage.3 krb5_storage_free.3 \
 	krb5_storage.3 krb5_storage_from_data.3 \
 	krb5_storage.3 krb5_storage_from_fd.3 \
 	krb5_storage.3 krb5_storage_from_mem.3 \
 	krb5_storage.3 krb5_storage_from_readonly_mem.3 \
 	krb5_storage.3 krb5_storage_get_byteorder.3 \
 	krb5_storage.3 krb5_storage_get_eof_code.3 \
 	krb5_storage.3 krb5_storage_is_flags.3 \
 	krb5_storage.3 krb5_storage_read.3 \
 	krb5_storage.3 krb5_storage_seek.3 \
 	krb5_storage.3 krb5_storage_set_byteorder.3 \
 	krb5_storage.3 krb5_storage_set_eof_code.3 \
 	krb5_storage.3 krb5_storage_set_flags.3 \
 	krb5_storage.3 krb5_storage_set_max_alloc.3 \
 	krb5_storage.3 krb5_storage_to_data.3 \
 	krb5_storage.3 krb5_storage_truncate.3 \
 	krb5_storage.3 krb5_storage_write.3 \
 	krb5_storage.3 krb5_store_address.3 \
 	krb5_storage.3 krb5_store_addrs.3 \
 	krb5_storage.3 krb5_store_authdata.3 \
 	krb5_storage.3 krb5_store_creds.3 \
 	krb5_storage.3 krb5_store_creds_tag.3 \
 	krb5_storage.3 krb5_store_data.3 \
 	krb5_storage.3 krb5_store_int16.3 \
 	krb5_storage.3 krb5_store_int32.3 \
 	krb5_storage.3 krb5_store_int8.3 \
 	krb5_storage.3 krb5_store_keyblock.3 \
 	krb5_storage.3 krb5_store_principal.3 \
 	krb5_storage.3 krb5_store_string.3 \
 	krb5_storage.3 krb5_store_stringz.3 \
 	krb5_storage.3 krb5_store_times.3 \
 	krb5_storage.3 krb5_store_uint16.3 \
 	krb5_storage.3 krb5_store_uint32.3 \
 	krb5_storage.3 krb5_store_uint8.3 \
 	krb5_support.3 krb5_acl_match_string.3 \
 	krb5_support.3 krb5_config_file_free.3 \
 	krb5_support.3 krb5_config_free_strings.3 \
 	krb5_support.3 krb5_config_get_bool.3 \
 	krb5_support.3 krb5_config_get_bool_default.3 \
 	krb5_support.3 krb5_config_get_list.3 \
 	krb5_support.3 krb5_config_get_string.3 \
 	krb5_support.3 krb5_config_get_string_default.3 \
 	krb5_support.3 krb5_config_get_strings.3 \
 	krb5_support.3 krb5_config_get_time.3 \
 	krb5_support.3 krb5_config_get_time_default.3 \
 	krb5_support.3 krb5_config_parse_file_multi.3 \
 	krb5_support.3 krb5_config_vget_bool.3 \
 	krb5_support.3 krb5_config_vget_bool_default.3 \
 	krb5_support.3 krb5_config_vget_list.3 \
 	krb5_support.3 krb5_config_vget_string.3 \
 	krb5_support.3 krb5_config_vget_string_default.3 \
 	krb5_support.3 krb5_config_vget_strings.3 \
 	krb5_support.3 krb5_config_vget_time.3 \
 	krb5_support.3 krb5_config_vget_time_default.3 \
 	krb5_support.3 krb5_expand_hostname.3 \
 	krb5_support.3 krb5_expand_hostname_realms.3 \
 	krb5_support.3 krb5_kuserok.3 \
 	krb5_support.3 krb5_plugin_register.3 \
 	krb5_ticket.3 krb5_ticket_get_flags.3 \
 	krb5_timeofday.3 krb5_us_timeofday.3 \
 	krb5_v4compat.3 krb524_convert_creds_kdc_ccache.3 \
 	krb5_verify_user.3 krb5_verify_opt_init.3 \
 	krb5_verify_user.3 krb5_verify_opt_set_flags.3 \
 	krb5_verify_user.3 krb5_verify_opt_set_keytab.3 \
 	krb5_verify_user.3 krb5_verify_opt_set_secure.3 \
 	krb5_verify_user.3 krb5_verify_opt_set_service.3 \
 	krb5_verify_user.3 krb5_verify_user_lrealm.3 \
 	krb5_verify_user.3 krb5_verify_user_opt.3
 
 SRCS=	acache.c \
 	acl.c \
 	add_et_list.c \
 	addr_families.c \
 	aname_to_localname.c \
 	appdefault.c \
 	asn1_glue.c \
 	auth_context.c \
 	build_ap_req.c \
 	build_auth.c \
 	cache.c \
 	changepw.c \
 	codec.c \
 	config_file.c \
 	constants.c \
 	context.c \
 	convert_creds.c \
 	copy_host_realm.c \
 	crc.c \
 	creds.c \
 	crypto-aes.c \
 	crypto-algs.c \
 	crypto-arcfour.c \
 	crypto-des-common.c \
 	crypto-des.c \
 	crypto-des3.c \
 	crypto-evp.c \
 	crypto-null.c \
 	crypto-pk.c \
 	crypto-rand.c \
 	crypto.c \
 	data.c \
 	deprecated.c \
 	digest.c \
 	doxygen.c \
 	eai_to_heim_errno.c \
 	error_string.c \
 	expand_hostname.c \
 	expand_path.c \
 	fcache.c \
 	free.c \
 	free_host_realm.c \
 	generate_seq_number.c \
 	generate_subkey.c \
 	get_addrs.c \
 	get_cred.c \
 	get_default_principal.c \
 	get_default_realm.c \
 	get_for_creds.c \
 	get_host_realm.c \
 	get_in_tkt.c \
 	get_port.c \
 	init_creds.c \
 	init_creds_pw.c \
 	kcm.c \
 	keyblock.c \
 	keytab.c \
 	keytab_any.c \
 	keytab_file.c \
 	keytab_keyfile.c \
 	keytab_memory.c \
 	krbhst.c \
 	kuserok.c \
 	log.c \
 	mcache.c \
 	misc.c \
 	mit_glue.c \
 	mk_error.c \
 	mk_priv.c \
 	mk_rep.c \
 	mk_req.c \
 	mk_req_ext.c \
 	mk_safe.c \
 	n-fold.c \
 	net_read.c \
 	net_write.c \
 	pac.c \
 	padata.c \
 	pcache.c \
 	pkinit.c \
 	plugin.c \
 	principal.c \
 	prog_setup.c \
 	prompter_posix.c \
 	rd_cred.c \
 	rd_error.c \
 	rd_priv.c \
 	rd_rep.c \
 	rd_req.c \
 	rd_safe.c \
 	read_message.c \
 	recvauth.c \
 	replay.c \
 	salt-aes.c \
 	salt-arcfour.c \
 	salt-des.c \
 	salt-des3.c \
 	salt.c \
 	scache.c \
 	send_to_kdc.c \
 	sendauth.c \
 	set_default_realm.c \
 	sock_principal.c \
 	store-int.c \
 	store.c \
 	store_emem.c \
 	store_fd.c \
 	store_mem.c \
 	ticket.c \
 	time.c \
 	transited.c \
 	verify_init.c \
 	verify_user.c \
 	version.c \
 	warn.c \
 	write_message.c
 
 SRCS+=	heim_err.c \
 	heim_err.h \
 	k524_err.c \
 	k524_err.h \
 	krb5_err.c \
 	krb5_err.h \
 	krb_err.c \
 	krb_err.h
 
 CFLAGS+=	-I${KRB5DIR}/lib/krb5 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-I${KRB5DIR}/lib/ipc \
 		-I${KRB5DIR}/base \
 		-I${SRCTOP}/contrib/com_err \
 		-I.
+CFLAGS+=	-DOPENSSL_API_COMPAT=0x10100000L
 
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/krb5 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/include ${SRCTOP}/kerberos5/include ${KRB5DIR}/doc/doxyout/krb5/man/man3/
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
@@ -1,25 +1,26 @@
 # $FreeBSD$
 
 PACKAGE=	kerberos
 
 PROG=	hxtool
 MAN=
 CFLAGS+=	-I${KRB5DIR}/lib/hx509 \
 		-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken \
 		-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
 
 CLEANFILES=	hxtool-commands.h hxtool-commands.c
 
 hxtool-commands.h: hxtool-commands.in
 	${SLC} ${.ALLSRC:M*.in}
 
 hxtool-commands.c: hxtool-commands.h
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/lib/hx509