aboutsummaryrefslogtreecommitdiff
path: root/krb5
diff options
context:
space:
mode:
Diffstat (limited to 'krb5')
-rw-r--r--krb5/Makefile2
-rw-r--r--krb5/Makefile.inc2
-rw-r--r--krb5/include/gssapi/Makefile7
-rw-r--r--krb5/include/osconf.h3
-rw-r--r--krb5/lib/crypto/version.map3
-rw-r--r--krb5/lib/gssapi/generic/Makefile.inc1
-rw-r--r--krb5/lib/gssapi/krb5/Makefile.inc3
-rw-r--r--krb5/lib/gssapi/version.map1
-rw-r--r--krb5/lib/kadm5clnt/version.map2
-rw-r--r--krb5/lib/kadm5srv/version.map2
-rw-r--r--krb5/lib/kdb/version.map2
-rw-r--r--krb5/lib/krb5/os/Makefile.inc1
-rw-r--r--krb5/lib/krb5/version.map5
-rw-r--r--krb5/libdata/Makefile44
-rw-r--r--krb5/libexec/kdc/Makefile22
-rw-r--r--krb5/usr.bin/ksu/Makefile3
-rw-r--r--krb5/usr.sbin/kdb5_util/Makefile1
17 files changed, 68 insertions, 36 deletions
diff --git a/krb5/Makefile b/krb5/Makefile
index c49601990c4a..e9bbcae106c1 100644
--- a/krb5/Makefile
+++ b/krb5/Makefile
@@ -1,7 +1,7 @@
SUBDIR= util .WAIT \
include .WAIT \
lib .WAIT\
- plugins libexec usr.bin usr.sbin
+ plugins libdata libexec usr.bin usr.sbin
# SUBDIR_PARALLEL=
.include <bsd.subdir.mk>
diff --git a/krb5/Makefile.inc b/krb5/Makefile.inc
index 8529ee90a2e0..5d302962208c 100644
--- a/krb5/Makefile.inc
+++ b/krb5/Makefile.inc
@@ -9,6 +9,8 @@
.include <src.opts.mk>
+KRB5_VERSION= 1.22-final
+
# MIT KRB5 uses KRB5_DIR. Heimdal uses KRB5DIR.
KRB5_SRCTOP= ${SRCTOP}/krb5
KRB5_DIR= ${SRCTOP}/crypto/krb5/src
diff --git a/krb5/include/gssapi/Makefile b/krb5/include/gssapi/Makefile
index b181187e9d95..997cbc06c389 100644
--- a/krb5/include/gssapi/Makefile
+++ b/krb5/include/gssapi/Makefile
@@ -10,14 +10,11 @@
.include "../Makefile.inc"
.PATH: ${KRB5_DIR}/lib/gssapi/krb5 \
- ${KRB5_DIR}/lib/gssapi/generic \
- ${KRB5_DIR}/include
+ ${KRB5_DIR}/lib/gssapi/generic
-INCSGROUPS= INCS GSSAPI_KRB5
INCSDIR= ${INCLUDEDIR}/gssapi
-INCS= gssapi.h \
- gssapi_alloc.h \
+INCS= gssapi_alloc.h \
gssapi_ext.h \
gssapi_generic.h \
gssapi_krb5.h
diff --git a/krb5/include/osconf.h b/krb5/include/osconf.h
index 5293d3eb7b88..f574aa10a192 100644
--- a/krb5/include/osconf.h
+++ b/krb5/include/osconf.h
@@ -96,8 +96,7 @@
#define DEFAULT_KPASSWD_PORT 464
-#define DEFAULT_KDC_UDP_PORTLIST "88"
-#define DEFAULT_KDC_TCP_PORTLIST "88"
+#define DEFAULT_KDC_PORTLIST "88"
#define DEFAULT_TCP_LISTEN_BACKLOG 5
/*
diff --git a/krb5/lib/crypto/version.map b/krb5/lib/crypto/version.map
index 57448f6d85fa..702abf195db0 100644
--- a/krb5/lib/crypto/version.map
+++ b/krb5/lib/crypto/version.map
@@ -8,7 +8,7 @@ k5crypto_3_MIT {
krb5_c_valid_cksumtype;
krb5_string_to_key;
krb5_c_encrypt_iov;
- krb5_c_checksum_length;
+ k5_hmac_md5;
is_keyed_cksum;
krb5_c_padding_length;
is_coll_proof_cksum;
@@ -105,5 +105,6 @@ k5crypto_3_MIT {
krb5_c_derive_prfplus;
k5_enctype_to_ssf;
krb5int_c_deprecated_enctype;
+ krb5_c_checksum_length;
};
HIDDEN { local: __*; _rest*; _save*; *; };
diff --git a/krb5/lib/gssapi/generic/Makefile.inc b/krb5/lib/gssapi/generic/Makefile.inc
index ef76172655d6..9dcc3476775e 100644
--- a/krb5/lib/gssapi/generic/Makefile.inc
+++ b/krb5/lib/gssapi/generic/Makefile.inc
@@ -23,7 +23,6 @@ SRCS+= disp_com_err_status.c \
util_buffer_set.c \
util_errmap.c \
util_seqstate.c \
- util_set.c \
util_token.c \
${GGEN} \
${GGENI}
diff --git a/krb5/lib/gssapi/krb5/Makefile.inc b/krb5/lib/gssapi/krb5/Makefile.inc
index beabe1ffa430..7e001aa0af27 100644
--- a/krb5/lib/gssapi/krb5/Makefile.inc
+++ b/krb5/lib/gssapi/krb5/Makefile.inc
@@ -39,7 +39,6 @@ SRCS+= accept_sec_context.c \
k5sealiov.c \
k5sealv3.c \
k5sealv3iov.c \
- k5unseal.c \
k5unsealiov.c \
krb5_gss_glue.c \
lucid_context.c \
@@ -54,11 +53,13 @@ SRCS+= accept_sec_context.c \
set_allowable_enctypes.c \
set_ccache.c \
store_cred.c \
+ unwrap.c \
util_cksum.c \
util_crypt.c \
util_seed.c \
util_seqnum.c \
val_cred.c \
+ verify_mic.c \
wrap_size_limit.c \
${K5GEN} \
${K5GENI}
diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map
index d52c0d3d1e36..c0e66aa3c382 100644
--- a/krb5/lib/gssapi/version.map
+++ b/krb5/lib/gssapi/version.map
@@ -140,7 +140,6 @@ gssapi_krb5_2_MIT {
gss_get_mic_iov_length;
gss_krb5_set_cred_rcache;
gss_krb5int_make_seal_token_v3;
- gss_krb5int_unseal_token_v3;
gss_localname;
gss_map_name_to_any;
gss_mech_iakerb;
diff --git a/krb5/lib/kadm5clnt/version.map b/krb5/lib/kadm5clnt/version.map
index 1b624130144d..bb3feb11cff1 100644
--- a/krb5/lib/kadm5clnt/version.map
+++ b/krb5/lib/kadm5clnt/version.map
@@ -115,5 +115,7 @@ kadm5clnt_mit_12_MIT {
xdr_setkey_arg;
xdr_ui_4;
kadm5_init_iprop;
+ xdr_calias_arg;
+ kadm5_create_alias;
};
HIDDEN { local: __*; _rest*; _save*; *; };
diff --git a/krb5/lib/kadm5srv/version.map b/krb5/lib/kadm5srv/version.map
index d18753acad3f..4eb5ba7c3ead 100644
--- a/krb5/lib/kadm5srv/version.map
+++ b/krb5/lib/kadm5srv/version.map
@@ -134,5 +134,7 @@ kadm5srv_mit_12_MIT {
xdr_sstring_arg;
xdr_ui_4;
kadm5_init_iprop;
+ xdr_calias_arg;
+ kadm5_create_alias;
};
HIDDEN { local: __*; _rest*; _save*; *; };
diff --git a/krb5/lib/kdb/version.map b/krb5/lib/kdb/version.map
index 63096fe7190a..54a093ff72bc 100644
--- a/krb5/lib/kdb/version.map
+++ b/krb5/lib/kdb/version.map
@@ -108,5 +108,7 @@ kdb5_10_MIT {
ulog_set_last;
xdr_kdb_incr_update_t;
krb5_dbe_sort_key_data;
+ krb5_dbe_make_alias_entry;
+ krb5_dbe_read_alias;
};
HIDDEN { local: __*; _rest*; _save*; *; };
diff --git a/krb5/lib/krb5/os/Makefile.inc b/krb5/lib/krb5/os/Makefile.inc
index ee6144f68773..a59f6fc56c59 100644
--- a/krb5/lib/krb5/os/Makefile.inc
+++ b/krb5/lib/krb5/os/Makefile.inc
@@ -10,6 +10,7 @@
.PATH: ${KRB5_DIR}/lib/krb5/os
SRCS+= accessor.c \
+ addr.c \
c_ustime.c \
ccdefname.c \
changepw.c \
diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map
index ce399a93e03e..3de2fdd879d0 100644
--- a/krb5/lib/krb5/version.map
+++ b/krb5/lib/krb5/version.map
@@ -629,5 +629,10 @@ krb5_3_MIT {
krb5int_parse_enctype_list;
krb5int_random_string;
krb5int_trace;
+ k5_sockaddr_to_address;
+ k5_addr_directional_accept;
+ k5_addr_directional_init;
+ k5_print_addr;
+ k5_print_addr_port;
};
HIDDEN { local: __*; _rest*; _save*; *; };
diff --git a/krb5/libdata/Makefile b/krb5/libdata/Makefile
new file mode 100644
index 000000000000..c9a2e8e9259f
--- /dev/null
+++ b/krb5/libdata/Makefile
@@ -0,0 +1,44 @@
+# Copyright (c) 2025 Lexi Winter.
+#
+# SPDX-License-Identifier: BSD-2-Clause OR ISC
+
+.include "../Makefile.inc"
+
+.PATH: ${KRB5_DIR}/build-tools
+
+PACKAGE=kerberos-lib
+
+PCFILES=gssrpc.pc \
+ kadm-client.pc \
+ kadm-server.pc \
+ kdb.pc \
+ krb5.pc \
+ krb5-gssapi.pc \
+ mit-krb5.pc \
+ mit-krb5-gssapi.pc
+
+CLEANFILES+= ${PCFILES}
+
+.SUFFIXES: .pc .pc.in
+
+.pc.in.pc:
+ sed -e 's,@prefix@,/usr,g ; \
+ s,@exec_prefix@,$${prefix},g ; \
+ s,@libdir@,${LIBDIR},g ; \
+ s,@includedir@,${INCLUDEDIR},g ; \
+ s,@KRB5_VERSION@,${KRB5_VERSION},g ; \
+ s,@KDB5_DB_LIB@,,g ; \
+ s,@DEFCCNAME@,FILE:/tmp/krb5cc_%{uid},g ; \
+ s,@DEFKTNAME@,FILE:/etc/krb5.keytab,g ; \
+ s,@DEFCKTNAME@,FILE:/var/krb5/user/%{euid}/client.keytab,g ; \
+ s,@COM_ERR_LIB@,-lcom_err,g ;' \
+ ${.IMPSRC} > ${.TARGET}
+
+all: ${PCFILES}
+ @if ! grep -q "^PACKAGE_VERSION='${KRB5_VERSION}'$$" ${KRB5_DIR}/configure; then \
+ echo "KRB5_VERSION ${KRB5_VERSION} does not match the source:"; \
+ grep "^PACKAGE_VERSION=" ${KRB5_DIR}/configure; \
+ exit 1; \
+ fi >&2
+
+.include <bsd.lib.mk>
diff --git a/krb5/libexec/kdc/Makefile b/krb5/libexec/kdc/Makefile
index ac5ada19eb37..1a0d5b9c208b 100644
--- a/krb5/libexec/kdc/Makefile
+++ b/krb5/libexec/kdc/Makefile
@@ -45,28 +45,6 @@ CFLAGS+=${DEFINES} \
-I${KRB5_SRCTOP}/include \
-I${.OBJDIR}
-GEN_KDC5_ERR= kdc5_err.et
-GEN_KDC5_ERR_C= ${GEN_KDC5_ERR:S/.et$/.c/}
-GEN_KDC5_ERR_H= ${GEN_KDC5_ERR:S/.et$/.h/}
-CLEANFILES+= ${GEN_KDC5_ERR_C} ${GEN_KDC5_ERR_H}
-GEN+= ${GEN_KDC5_ERR_C}
-GENI+= ${GEN_KDC5_ERR_H}
-
-${GEN_KDC5_ERR:[2..-1]}: .NOMETA
-${GEN_KDC5_ERR_H}: ${GEN_KDC5_ERR}
- rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.c et-h-${.PREFIX}.h
- cp ${.ALLSRC} et-h-${.PREFIX}.et
- ${COMPILE_ET} et-h-${.PREFIX}.et
- mv et-h-${.PREFIX}.h ${.PREFIX}.h
- rm -f et-h-${.PREFIX}.et et-h-${.PREFIX}.h
-
-${GEN_KDC5_ERR_C}: ${GEN_KDC5_ERR}
- rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c et-c-${.PREFIX}.h
- cp ${.ALLSRC} et-c-${.PREFIX}.et
- ${COMPILE_ET} et-c-${.PREFIX}.et
- mv et-c-${.PREFIX}.c ${.PREFIX}.c
- rm -f et-c-${.PREFIX}.et et-c-${.PREFIX}.c
-
CLEANFILES+= krb5kdc.8
krb5kdc.8: krb5kdc.man
diff --git a/krb5/usr.bin/ksu/Makefile b/krb5/usr.bin/ksu/Makefile
index 37a4c166aec6..7296ea61b73d 100644
--- a/krb5/usr.bin/ksu/Makefile
+++ b/krb5/usr.bin/ksu/Makefile
@@ -23,7 +23,8 @@ SRCS= authorization.c \
xmalloc.c
CFLAGS+=-I${KRB5_DIR}/include \
- -I${KRB5_SRCTOP}/include
+ -I${KRB5_SRCTOP}/include \
+ -DGET_TGT_VIA_PASSWD
MAN= ksu.1
diff --git a/krb5/usr.sbin/kdb5_util/Makefile b/krb5/usr.sbin/kdb5_util/Makefile
index ef821d6867f5..0c1ad4d56bad 100644
--- a/krb5/usr.sbin/kdb5_util/Makefile
+++ b/krb5/usr.sbin/kdb5_util/Makefile
@@ -21,7 +21,6 @@ SRCS= dump.c \
kdb5_mkey.c \
kdb5_stash.c \
kdb5_util.c \
- ovload.c \
strtok.c \
tabdump.c \
tdumputil.c \
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-15 01:56:44 +0000