CVS commit: src/crypto/external/bsd/heimdal

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Oct 12 17:18:39 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile

Log Message:
heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm.

Loose ends for static builds in the fix for PR lib/57406.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Oct 12 17:18:39 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile

Log Message:
heimdal: Make sure whatever uses libhdb also gets libsqlite3 & libm.

Loose ends for static builds in the fix for PR lib/57406.

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.10 src/crypto/external/bsd/heimdal/Makefile.inc:1.11
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.10	Wed Oct 11 14:08:25 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc	Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2023/10/11 14:08:25 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.11 2023/10/12 17:18:38 riastradh Exp $
 
 HEIMBASE?=	${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=	${HEIMBASE}/dist
@@ -24,6 +24,8 @@ DPLIBVERS=	vers ${HEIMBASE}/lib/libvers
 DPLIBWIND=	wind ${HEIMBASE}/lib/libwind
 KRB5LDADD=	-lcrypto -lcrypt
 KRB5DPADD=	${LIBCRYPTO} ${LIBCRYPT}
+HDBLDADD=	-lsqlite3 -lm
+HDBDPADD=	${LIBSQLITE3} ${LIBM}
 
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}

Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5	Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile	Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBKDC} ${DPLIBHDB} ${D
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
 
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}

Index: src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile:1.5	Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile	Thu Oct 12 17:18:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/12 17:18:38 riastradh Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -19,5 +19,5 @@ PROGDPLIBS+= ${DPLIBHDB}
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
 
-LDADD+= ${KRB5LDADD}
-DPADD+= ${KRB5DPADD}
+LDADD+= ${KRB5LDADD} ${HDBLDADD}
+DPADD+= ${KRB5DPADD} ${HDBDPADD}

Index: src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5 src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.6
--- src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile:1.5	Thu Jun 

CVS commit: src/crypto/external/bsd/heimdal

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 11 12:34:42 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/include: config.h
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
heimdal: Disable sqlite3 credential cache (SCC).

SCC is not usable in Heimdal 7.8.0, and this brings a dependency on
libsqlite3 into libkrb5 and therefore libgssapi, which is problematic
downstream applications that have sqlite3 from pkgsrc or statically
built in.

SCC will undergo substantial revision in the next Heimdal version
(https://github.com/heimdal/heimdal/pull/1143).  We can revisit later
how to deal with this -- perhaps by symbol-renaming a copy of sqlite3
in Heimdal as it looks like upstream intends to do.

PR lib/57406

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.8	Thu Jun 22 22:39:37 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc	Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2023/10/11 12:34:42 riastradh Exp $
 
 HEIMBASE?=	${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=	${HEIMBASE}/dist
@@ -22,8 +22,8 @@ DPLIBROKEN=	roken ${HEIMBASE}/lib/librok
 DPLIBSL=	sl ${HEIMBASE}/lib/libsl
 DPLIBVERS=	vers ${HEIMBASE}/lib/libvers
 DPLIBWIND=	wind ${HEIMBASE}/lib/libwind
-KRB5LDADD=	-lsqlite3 -lcrypto -lcrypt -lm
-KRB5DPADD=	${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
+KRB5LDADD=	-lcrypto -lcrypt -lm
+KRB5DPADD=	${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
 
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}

Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.11 src/crypto/external/bsd/heimdal/include/config.h:1.12
--- src/crypto/external/bsd/heimdal/include/config.h:1.11	Mon Jun 19 21:41:45 2023
+++ src/crypto/external/bsd/heimdal/include/config.h	Wed Oct 11 12:34:42 2023
@@ -754,7 +754,7 @@ static /**/const char *const rcsid[] = {
 #define HAVE_SA_FAMILY_T 1
 
 /* Define if you want support for cache in sqlite. */
-#define HAVE_SCC 1
+/* #undef HAVE_SCC */
 
 /* Define to 1 if you have the  header file. */
 #define HAVE_SEARCH_H 1

Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5	Mon Jun 19 23:56:55 2023
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile	Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/11 12:34:42 riastradh Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -18,7 +18,8 @@ LIBDPLIBS+=	hx509		${HEIMBASE}/lib/libhx
 		com_err		${HEIMBASE}/lib/libcom_err	\
 		roken		${HEIMBASE}/lib/libroken	\
 		wind		${HEIMBASE}/lib/libwind		\
-		heimbase	${HEIMBASE}/lib/libheimbase
+		heimbase	${HEIMBASE}/lib/libheimbase	\
+		sqlite3		${NETBSDSRCDIR}/external/public-domain/sqlite/lib
 
 HEIMSRCS= hdb_err.et hdb.asn1
 ASN1_OPTS.hdb.asn1+= --one-code-file --sequence=HDB-Ext-KeySet --sequence=Keys

Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.16
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.15	Tue Jun 20 17:23:02 2023
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile	Wed Oct 11 12:34:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/06/20 17:23:02 christos Exp $
+# $NetBSD: Makefile,v 1.16 2023/10/11 12:34:42 riastradh Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -23,7 +23,6 @@ LIBDPLIBS+=	\
 	roken		${HEIMBASE}/lib/libroken	\
 	wind		${HEIMBASE}/lib/libwind		\
 	heimbase	${HEIMBASE}/lib/libheimbase	\
-	sqlite3		${NETBSDSRCDIR}/external/public-domain/sqlite/lib \
 	crypt		${NETBSDSRCDIR}/lib/libcrypt
 
 HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et

CVS commit: src/crypto/external/bsd/heimdal

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Oct 11 12:34:42 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/include: config.h
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
heimdal: Disable sqlite3 credential cache (SCC).

SCC is not usable in Heimdal 7.8.0, and this brings a dependency on
libsqlite3 into libkrb5 and therefore libgssapi, which is problematic
downstream applications that have sqlite3 from pkgsrc or statically
built in.

SCC will undergo substantial revision in the next Heimdal version
(https://github.com/heimdal/heimdal/pull/1143).  We can revisit later
how to deal with this -- perhaps by symbol-renaming a copy of sqlite3
in Heimdal as it looks like upstream intends to do.

PR lib/57406

XXX pullup-10


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Thu Sep 14 19:29:52 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile

Log Message:
verify_krb5_conf: enable lint

There is no apparent reason to disable lint for this program.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.5 src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.6
--- src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile:1.5	Thu Jun 22 22:39:23 2023
+++ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile	Thu Sep 14 19:29:52 2023
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.5 2023/06/22 22:39:23 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2023/09/14 19:29:52 rillig Exp $
 
 WARNS?=	2	# XXX -Wextra
 
-NOLINT= # defined
-
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
 

CVS commit: src/crypto/external/bsd/heimdal/bin/verify_krb5_conf

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Thu Sep 14 19:29:52 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile

Log Message:
verify_krb5_conf: enable lint

There is no apparent reason to disable lint for this program.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Sep 11 15:12:12 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c

Log Message:
Explicitly load the legacy provider instead of using EVP_CIPHER_fetch() which
leaks memory.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
diff -u src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.6 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.7
--- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.6	Mon Jun 19 19:10:48 2023
+++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h	Mon Sep 11 11:12:12 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto-headers.h,v 1.6 2023/06/19 23:10:48 christos Exp $	*/
+/*	$NetBSD: crypto-headers.h,v 1.7 2023/09/11 15:12:12 christos Exp $	*/
 
 #ifndef __crypto_header__
 #define __crypto_header__
@@ -33,9 +33,6 @@
 #  define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
 #  define BN_is_negative(bn) ((bn)->neg != 0)
 # endif
-#if OPENSSL_VERSION_NUMBER >= 0x3000UL
-# define EVP_rc4() EVP_CIPHER_fetch(NULL, "rc4", "provider=legacy")
-#endif
 #endif
 
 #include 

Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.7 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.8
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.7	Mon Jun 19 17:41:44 2023
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c	Mon Sep 11 11:12:12 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: context.c,v 1.7 2023/06/19 21:41:44 christos Exp $	*/
+/*	$NetBSD: context.c,v 1.8 2023/09/11 15:12:12 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan
@@ -38,6 +38,9 @@
 #include "krb5_locl.h"
 #include 
 #include 
+#if OPENSSL_VERSION_NUMBER >= 0x3000UL
+#include 
+#endif
 
 #define INIT_FIELD(C, T, E, D, F)	\
 (C)->E = krb5_config_get_ ## T ## _default ((C), NULL, (D), 	\
@@ -396,6 +399,9 @@ init_context_once(void *ctx)
 	krb5_config_free_strings(dirs);
 
 bindtextdomain(HEIMDAL_TEXTDOMAIN, HEIMDAL_LOCALEDIR);
+#if OPENSSL_VERSION_NUMBER >= 0x3000UL
+OSSL_PROVIDER_load(NULL, "legacy");
+#endif
 }
 
 

CVS commit: src/crypto/external/bsd/heimdal/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Sep 11 15:12:12 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c

Log Message:
Explicitly load the legacy provider instead of using EVP_CIPHER_fetch() which
leaks memory.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 22 22:39:39 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
fix sun2


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 22 22:39:39 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
fix sun2


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.7 src/crypto/external/bsd/heimdal/Makefile.inc:1.8
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.7	Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/Makefile.inc	Thu Jun 22 18:39:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
 
 HEIMBASE?=	${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=	${HEIMBASE}/dist
@@ -22,6 +22,8 @@ DPLIBROKEN=	roken ${HEIMBASE}/lib/librok
 DPLIBSL=	sl ${HEIMBASE}/lib/libsl
 DPLIBVERS=	vers ${HEIMBASE}/lib/libvers
 DPLIBWIND=	wind ${HEIMBASE}/lib/libwind
+KRB5LDADD=	-lsqlite3 -lcrypto -lcrypt -lm
+KRB5DPADD=	${LIBSQLITE3} ${LIBCRYPTO} ${LIBCRYPT} ${LIBM}
 
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}

Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.7 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.8
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.7	Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc	Thu Jun 22 18:39:37 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2023/06/22 22:39:37 christos Exp $
 
 BINDIR=/usr/libexec
 
-PROGDPLIBS+= ${DPLIBKRB5} ${DPLIBHEIMNTLM} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}

Index: src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile:1.4	Tue Jun 20 13:23:03 2023
+++ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile	Thu Jun 22 

CVS commit: src/crypto/external/bsd/heimdal/bin

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 22 22:39:23 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile

Log Message:
fix sun2


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/bin/Makefile.inc:1.5	Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/Makefile.inc	Thu Jun 22 18:39:22 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 BINDIR=/usr/bin
 
-PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHX509} ${DPLIBASN1} ${DPLIBCOM_ERR}
+PROGDPLIBS += ${DPLIBWIND} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}

Index: src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/gsstool/Makefile:1.3	Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/gsstool/Makefile	Thu Jun 22 18:39:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/22 22:39:22 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,10 +13,10 @@ HEIMSRCS=	gsstool.c gss-commands.in
 
 MAN=
 
-PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBSL}
-
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBHEIMNTLM} ${DPLIBSL}
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
+
+LDADD+= -ledit -lterminfo ${KRB5LDADD}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO} ${KRB5DPADD}

Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.5 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.6
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.5	Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile	Thu Jun 22 18:39:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,11 +13,12 @@ HEIMSRCS= hxtool.c hxtool-commands.in
 
 MAN=
 
-PROGDPLIBS+= ${DPLIBASN1} ${DPLIBGSSAPI} ${DPLIBHX509} ${DPLIBSL}
-LDADD+= -lcrypto -ledit -lterminfo
-DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBGSSAPI} ${DPLIBSL}
 
 COPTS.hxtool.c+= -Wno-error=deprecated-declarations
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
+
+LDADD+= -lcrypto -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}

Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.5 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.6
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.5	Tue Jun 20 13:23:01 2023
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile	Thu Jun 22 18:39:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/22 22:39:22 christos Exp $
 
 .include 
 .include 

CVS commit: src/crypto/external/bsd/heimdal/bin

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun 22 22:39:23 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile

Log Message:
fix sun2


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 17:23:05 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/lib/libvers: Makefile
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
Use PROGDPLIBS instead of LDADD/DPADD; remove ui.c kludges


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libvers/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.6 src/crypto/external/bsd/heimdal/Makefile.inc:1.7

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 17:23:05 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin: Makefile.inc
src/crypto/external/bsd/heimdal/bin/gsstool: Makefile
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/lib/libvers: Makefile
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
Use PROGDPLIBS instead of LDADD/DPADD; remove ui.c kludges


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libvers/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/include/hcrypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 17:22:01 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/include/hcrypto: ui.h

Log Message:
Don't use the hcrypto version, use the OpenSSL one.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/include/hcrypto/ui.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/include/hcrypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 17:22:01 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/include/hcrypto: ui.h

Log Message:
Don't use the hcrypto version, use the OpenSSL one.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/include/hcrypto/ui.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/include/hcrypto/ui.h
diff -u src/crypto/external/bsd/heimdal/include/hcrypto/ui.h:1.1 src/crypto/external/bsd/heimdal/include/hcrypto/ui.h:1.2
--- src/crypto/external/bsd/heimdal/include/hcrypto/ui.h:1.1	Tue Jun 20 12:49:46 2023
+++ src/crypto/external/bsd/heimdal/include/hcrypto/ui.h	Tue Jun 20 13:22:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ui.h,v 1.1 2023/06/20 16:49:46 christos Exp $	*/
+/*	$NetBSD: ui.h,v 1.2 2023/06/20 17:22:01 christos Exp $	*/
 
 /*
  * Copyright (c) 2005 Kungliga Tekniska Högskolan
@@ -39,7 +39,10 @@
 #define _HEIM_UI_H 1
 
 /* symbol renaming */
+#if 0
+/* use the OpenSSL symbol, not worth it for a "Verify failed" printf */
 #define UI_UTIL_read_pw_string hc_UI_UTIL_read_pw_string
+#endif
 
 /* OpenSSL API extensions */
 #define UI_UTIL_FLAG_VERIFY	0x1 /* ask to verify password */

CVS commit: src/crypto/external/bsd/heimdal/include/hcrypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 16:49:46 UTC 2023

Added Files:
src/crypto/external/bsd/heimdal/include/hcrypto: ui.h

Log Message:
Add hcrypto/ui.h to avoid -I gymnastics everywhere else


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/heimdal/include/hcrypto/ui.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/include/hcrypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 16:49:46 UTC 2023

Added Files:
src/crypto/external/bsd/heimdal/include/hcrypto: ui.h

Log Message:
Add hcrypto/ui.h to avoid -I gymnastics everywhere else


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/heimdal/include/hcrypto/ui.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/heimdal/include/hcrypto/ui.h
diff -u /dev/null src/crypto/external/bsd/heimdal/include/hcrypto/ui.h:1.1
--- /dev/null	Tue Jun 20 12:49:46 2023
+++ src/crypto/external/bsd/heimdal/include/hcrypto/ui.h	Tue Jun 20 12:49:46 2023
@@ -0,0 +1,51 @@
+/*	$NetBSD: ui.h,v 1.1 2023/06/20 16:49:46 christos Exp $	*/
+
+/*
+ * Copyright (c) 2005 Kungliga Tekniska Högskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+/* Id */
+
+#ifndef _HEIM_UI_H
+#define _HEIM_UI_H 1
+
+/* symbol renaming */
+#define UI_UTIL_read_pw_string hc_UI_UTIL_read_pw_string
+
+/* OpenSSL API extensions */
+#define UI_UTIL_FLAG_VERIFY	0x1 /* ask to verify password */
+#define UI_UTIL_FLAG_VERIFY_SILENT  0x2 /* silence on verify failure */
+
+int	UI_UTIL_read_pw_string(char *, int, const char *, int); /* XXX */
+
+#endif /* _HEIM_UI_H */
+

CVS commit: src/crypto/external/bsd/heimdal/libexec/kadmind

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 07:17:11 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile

Log Message:
re-fix the previous - i had only fixed one case, not the general one.

guard the .BEGIN: rule with:

   .if !make(clean) && !make(cleandir) && !make(distclean) && !make(obj)

so that it doesn't trigger in cases where we don't expect the objdir
to exist already, or we don't want to be adding things while we're
cleaning them out.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.4 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.5
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.4	Tue Jun 20 05:06:04 2023
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile	Tue Jun 20 07:17:11 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 05:06:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 07:17:11 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -27,5 +27,7 @@ DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LI
 
 # XXX
 CLEANFILES+=hcrypto
-${OBJS}:
+.if !make(clean) && !make(cleandir) && !make(distclean) && !make(obj)
+.BEGIN:
 	@ln -sf ${HEIMDIST}/lib/hcrypto .
+.endif

CVS commit: src/crypto/external/bsd/heimdal/libexec/kadmind

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 07:17:11 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile

Log Message:
re-fix the previous - i had only fixed one case, not the general one.

guard the .BEGIN: rule with:

   .if !make(clean) && !make(cleandir) && !make(distclean) && !make(obj)

so that it doesn't trigger in cases where we don't expect the objdir
to exist already, or we don't want to be adding things while we're
cleaning them out.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/libexec/kadmind

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 05:06:04 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile

Log Message:
don't try to setup things in objdir before it exists.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
diff -u src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.3 src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.4
--- src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile:1.3	Mon Jun 19 23:11:44 2023
+++ src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile	Tue Jun 20 05:06:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 05:06:04 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -25,7 +25,7 @@ DPADD+= ${LIBGSSAPI} ${LIBKADM5SRV} ${LI
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 
 
+# XXX
 CLEANFILES+=hcrypto
-
-.BEGIN:
+${OBJS}:
 	@ln -sf ${HEIMDIST}/lib/hcrypto .

CVS commit: src/crypto/external/bsd/heimdal/libexec/kadmind

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 05:06:04 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile

Log Message:
don't try to setup things in objdir before it exists.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 00:30:17 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile

Log Message:
XXX stop gap to fix the builds in a way that doesn't make them useless.

it does build "ui.c" a large number of times into individual places.
in the libraries, they're force to local symbols, and in the binaries
it doesn't really matter.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.3	Tue May  9 22:12:33 2023
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile	Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/05/09 22:12:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -7,6 +7,8 @@ USE_FORT?= yes	# cryptographic software
 
 .PATH: ${HEIMDIST}/lib/hx509
 
+CPPFLAGS+=-I${HEIMDIST}/lib
+
 PROG= hxtool
 
 HEIMSRCS= hxtool.c hxtool-commands.in

Index: src/crypto/external/bsd/heimdal/bin/kcc/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/kcc/Makefile:1.3	Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/bin/kcc/Makefile	Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -21,6 +21,7 @@ SRCS=	copy_cred_cache.c	\
 
 CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
 CPPFLAGS+= -I${HEIMDIST}/kuser
+CPPFLAGS+= -I${HEIMDIST}/lib
 
 LDADD+= -lkafs -lsl
 LDADD+= -ledit -lterminfo

Index: src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile:1.2	Wed May 25 19:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile	Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,5 +13,7 @@ SRCS= kdestroy.c
 LDADD+= -lkafs -lsl -lheimntlm
 DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
 
+CPPFLAGS+= -I${HEIMDIST}/lib
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile:1.2	Wed May 25 19:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile	Tue Jun 20 00:30:16 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -13,5 +13,7 @@ SRCS= kgetcred.c
 LDADD+= -lkafs -lsl 

CVS commit: src/crypto/external/bsd/heimdal

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jun 20 00:30:17 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile
src/crypto/external/bsd/heimdal/bin/kcc: Makefile
src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile
src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile
src/crypto/external/bsd/heimdal/bin/kinit: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
src/crypto/external/bsd/heimdal/sbin/hprop: Makefile
src/crypto/external/bsd/heimdal/sbin/kcm: Makefile
src/crypto/external/bsd/heimdal/sbin/kdc: Makefile
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile

Log Message:
XXX stop gap to fix the builds in a way that doesn't make them useless.

it does build "ui.c" a large number of times into individual places.
in the libraries, they're force to local symbols, and in the binaries
it doesn't really matter.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/bin/kcc/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kinit/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/hprop/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kcm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kdc/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/lib

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jun 19 23:56:56 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
fix missing header issues.

might seems to have an undef symbol issue in libkrb5.so:
hc_UI_UTIL_read_pw_string


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.7
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6	Mon May  8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile	Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/19 23:56:55 mrg Exp $
 
 USE_FORT?= yes# network protocol library
 
@@ -275,6 +275,7 @@ INCSDIR=	/usr/include
 CPPFLAGS+=			\
 	-I${HEIMDIST}/lib/krb5	\
 	-I${HEIMDIST}/lib/asn1	\
+	-I${HEIMDIST}/lib
 
 COPTS.krb5__get_mic.c+= -Wno-error=deprecated-declarations
 COPTS.krb5__wrap.c+= -Wno-error=deprecated-declarations

Index: src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libhdb/Makefile:1.4	Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libhdb/Makefile	Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -48,7 +48,8 @@ CPPFLAGS+=\
 	-I${HEIMBASE}/include/krb5	\
 	-I${HEIMDIST}/lib/asn1		\
 	-I${HEIMDIST}/lib/krb5		\
-	-DHDB_DB_DIR=\"/var/heimdal\"	\
+	-I${HEIMDIST}/lib		\
+	-DHDB_DB_DIR=\"/var/heimdal\"
 
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4	Mon May  8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile	Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/19 23:56:55 mrg Exp $
 
 USE_FORT?= yes	# cryptographic software
 
@@ -20,6 +20,9 @@ LIBDPLIBS+=	asn1	${.CURDIR}/../libasn1 \
 
 HEIMSRCS= ntlm_err.et ntlm.c
 
+CPPFLAGS+=\
+	-I${HEIMDIST}/lib
+
 INCS=		heimntlm.h heimntlm-protos.h ${COMPILE_ET_INCS}
 
 INCSDIR=	/usr/include/krb5

Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.9
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8	Mon May  8 22:17:36 2023
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile	Mon Jun 19 23:56:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/05/08 22:17:36 christos Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/19 23:56:55 mrg Exp $
 
 NOLINT=		# defined
 
@@ -61,7 +61,8 @@ SRCS=\
 
 CPPFLAGS+=\
 	-I${HEIMDIST}/lib/hx509/ref	\
-	-I${HEIMDIST}/lib/asn1
+	-I${HEIMDIST}/lib/asn1		\
+	-I${HEIMDIST}/lib
 
 sel-gram.c: ${ASN1_INCS} ${COMPILE_ET_INCS}
 

Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.5

CVS commit: src/crypto/external/bsd/heimdal/lib

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jun 19 23:56:56 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libhdb: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
fix missing header issues.

might seems to have an undef symbol issue in libkrb5.so:
hc_UI_UTIL_read_pw_string


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 23:11:45 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
Adjust the build to include ui.c from hcrypto.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile:1.2	Wed May 25 15:21:17 2011
+++ src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile	Mon Jun 19 19:11:43 2023
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:43 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes	# cryptographic software
 
-.PATH: ${HEIMDIST}/kpasswd
+.PATH: ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
+
+CPPFLAGS+=-I${HEIMDIST}/lib
 
 PROG= kpasswd
-SRCS= kpasswd.c
+SRCS= kpasswd.c ui.c
 
 LDADD+= -lkafs -lsl -lheimntlm
 DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}

Index: src/crypto/external/bsd/heimdal/bin/kvno/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.1	Tue Apr  1 17:38:44 2014
+++ src/crypto/external/bsd/heimdal/bin/kvno/Makefile	Mon Jun 19 19:11:43 2023
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile,v 1.1 2014/04/01 21:38:44 christos Exp $
+# $NetBSD: Makefile,v 1.2 2023/06/19 23:11:43 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes	# cryptographic software
 
-.PATH: ${HEIMDIST}/kuser
+.PATH: ${HEIMDIST}/kuser ${HEIMDIST}/lib/hcrypto
 
 PROG= kvno
 
 
 #HEIMSRCS= kcc-commands.in
 
-SRCS=	kvno.c
+SRCS=	kvno.c ui.c
 MAN= kvno.1
 
-CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
+CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 -I${HEIMDIST}/lib
 COPTS.kvno.c+= -Wno-deprecated-declarations
 
 LDADD+= -lkafs -lsl

Index: src/crypto/external/bsd/heimdal/bin/string2key/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/string2key/Makefile:1.2	Wed May 25 15:21:17 2011
+++ src/crypto/external/bsd/heimdal/bin/string2key/Makefile	Mon Jun 19 19:11:44 2023
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
 
 USE_FORT?= yes	# cryptographic software
 
-.PATH: ${HEIMDIST}/kdc
+.PATH: 

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 23:11:45 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile
src/crypto/external/bsd/heimdal/bin/kvno: Makefile
src/crypto/external/bsd/heimdal/bin/string2key: Makefile
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile
src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile
src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile
src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile
src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile
src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile
src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile
src/crypto/external/bsd/heimdal/sbin/kstash: Makefile
src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile

Log Message:
Adjust the build to include ui.c from hcrypto.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kvno/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/string2key/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/hpropd/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/kadmind/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/iprop-log/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/kadmin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/sbin/kstash/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/ktutil/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/dist/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 23:10:48 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h

Log Message:
need the hcrypto/ui.h header for UI_UTIL_read_pw_string/UI_UTIL_FLAG_VERIFY*


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
diff -u src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.5 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.6
--- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.5	Mon Jun 19 17:41:41 2023
+++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h	Mon Jun 19 19:10:48 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto-headers.h,v 1.5 2023/06/19 21:41:41 christos Exp $	*/
+/*	$NetBSD: crypto-headers.h,v 1.6 2023/06/19 23:10:48 christos Exp $	*/
 
 #ifndef __crypto_header__
 #define __crypto_header__
@@ -38,6 +38,8 @@
 #endif
 #endif
 
+#include 
+
 #else /* !HAVE_HCRYPTO_W_OPENSSL */
 
 #ifdef KRB5

CVS commit: src/crypto/external/bsd/heimdal/dist/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 23:10:48 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h

Log Message:
need the hcrypto/ui.h header for UI_UTIL_read_pw_string/UI_UTIL_FLAG_VERIFY*


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 21:41:46 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist: NEWS config.guess configure.ac
src/crypto/external/bsd/heimdal/dist/admin: add.c change.c
src/crypto/external/bsd/heimdal/dist/cf: roken-frag.m4
src/crypto/external/bsd/heimdal/dist/doc: vars.texi
src/crypto/external/bsd/heimdal/dist/doc/doxyout/base/man/man3:
heimbase.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/gssapi/man/man3:
gssapi.3 gssapi_mechs_intro.3 gssapi_services_intro.3
internal_v_smechname.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hcrypto/man/man3:
hcrypto_core.3 hcrypto_des.3 hcrypto_dh.3 hcrypto_evp.3
hcrypto_misc.3 hcrypto_rand.3 hcrypto_rsa.3 page_des.3 page_dh.3
page_evp.3 page_rand.3 page_rsa.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hdb/man/man3: HDB.3
hdb_entry_ex.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hx509/man/man3:
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 page_ca.3 page_cert.3 page_cms.3
page_env.3 page_error.3 page_keyset.3 page_lock.3 page_name.3
page_peer.3 page_print.3 page_revoke.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/krb5/man/man3: krb5.3
krb5_address.3 krb5_auth.3 krb5_ccache.3 krb5_ccache_intro.3
krb5_credential.3 krb5_crypto.3 krb5_crypto_iov.3 krb5_deprecated.3
krb5_digest.3 krb5_error.3 krb5_fileformats.3
krb5_init_creds_intro.3 krb5_introduction.3 krb5_keytab.3
krb5_keytab_intro.3 krb5_pac.3 krb5_prepend_error_message.3
krb5_principal.3 krb5_principal_intro.3 krb5_storage.3
krb5_support.3 krb5_ticket.3 krb5_v4compat.3
krb5plugin_an2ln_ftable_desc.3 krb5plugin_db_ftable_desc.3
krb5plugin_kuserok_ftable_desc.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/ntlm/man/man3:
ntlm_buf.3 ntlm_core.3 ntlm_type1.3 ntlm_type2.3 ntlm_type3.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/wind/man/man3: wind.3
src/crypto/external/bsd/heimdal/dist/include: bits.c crypto-headers.h
heim_threads.h
src/crypto/external/bsd/heimdal/dist/kadmin: ank.c cpw.c ext.c get.c
kadmind.8 kadmind.c mod.c rpc.c stash.c util.c
src/crypto/external/bsd/heimdal/dist/kcm: cache.c client.c config.c
glue.c kcm.8 protocol.c
src/crypto/external/bsd/heimdal/dist/kdc: connect.c default_config.c
digest.c hprop.8 hpropd.8 hpropd.c kdc-private.h kdc-replay.c kdc.8
kdc.h kerberos5.c krb5tgs.c kstash.8 kstash.c kx509.c pkinit-ec.c
pkinit.c string2key.8 windc_plugin.h
src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswd.c kpasswdd.8
kpasswdd.c
src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1
kdestroy.1 kdestroy.c kgetcred.1 kgetcred.c kimpersonate.8 kinit.1
kinit.c klist.1 klist.c kswitch.c
src/crypto/external/bsd/heimdal/dist/lib/asn1: asn1parse.c asn1parse.h
check-common.c check-common.h check-der.c check-gen.c
check-template.c der_cmp.c der_copy.c der_get.c der_length.c
der_put.c gen.c gen_copy.c gen_decode.c gen_free.c gen_locl.h lex.c
lex.h main.c
src/crypto/external/bsd/heimdal/dist/lib/base: bsearch.c dll.c error.c
heimbase.c
src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3
compile_et.c lex.c parse.c parse.h
src/crypto/external/bsd/heimdal/dist/lib/gssapi: gss_acquire_cred.3
gssapi.3 test_context.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
accept_sec_context.c acquire_cred.c arcfour.c cfx.c decapsulate.c
delete_sec_context.c display_status.c get_mic.c gsskrb5-private.h
init_sec_context.c unwrap.c verify_mic.c wrap.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech:
gss_display_status.c gss_import_name.c gss_mech_switch.c
gss_pname_to_uid.c mech.5 mech_locl.h
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm: creds.c crypto.c
init_sec_context.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/spnego:
accept_sec_context.c
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: bn.c des.c dh.c
engine.c engine.h evp-cc.c evp-cc.h evp-hcrypto.c evp-hcrypto.h
evp-openssl.c evp-openssl.h evp-pkcs11.c evp-pkcs11.h evp-w32.c
evp-w32.h evp-wincng.c evp-wincng.h evp.c evp.h
example_evp_cipher.c mdtest.c pkcs5.c test_bulk.c 

CVS commit: src/crypto/external/bsd/heimdal

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jun 19 21:41:46 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist: NEWS config.guess configure.ac
src/crypto/external/bsd/heimdal/dist/admin: add.c change.c
src/crypto/external/bsd/heimdal/dist/cf: roken-frag.m4
src/crypto/external/bsd/heimdal/dist/doc: vars.texi
src/crypto/external/bsd/heimdal/dist/doc/doxyout/base/man/man3:
heimbase.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/gssapi/man/man3:
gssapi.3 gssapi_mechs_intro.3 gssapi_services_intro.3
internal_v_smechname.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hcrypto/man/man3:
hcrypto_core.3 hcrypto_des.3 hcrypto_dh.3 hcrypto_evp.3
hcrypto_misc.3 hcrypto_rand.3 hcrypto_rsa.3 page_des.3 page_dh.3
page_evp.3 page_rand.3 page_rsa.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hdb/man/man3: HDB.3
hdb_entry_ex.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/hx509/man/man3:
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 page_ca.3 page_cert.3 page_cms.3
page_env.3 page_error.3 page_keyset.3 page_lock.3 page_name.3
page_peer.3 page_print.3 page_revoke.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/krb5/man/man3: krb5.3
krb5_address.3 krb5_auth.3 krb5_ccache.3 krb5_ccache_intro.3
krb5_credential.3 krb5_crypto.3 krb5_crypto_iov.3 krb5_deprecated.3
krb5_digest.3 krb5_error.3 krb5_fileformats.3
krb5_init_creds_intro.3 krb5_introduction.3 krb5_keytab.3
krb5_keytab_intro.3 krb5_pac.3 krb5_prepend_error_message.3
krb5_principal.3 krb5_principal_intro.3 krb5_storage.3
krb5_support.3 krb5_ticket.3 krb5_v4compat.3
krb5plugin_an2ln_ftable_desc.3 krb5plugin_db_ftable_desc.3
krb5plugin_kuserok_ftable_desc.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/ntlm/man/man3:
ntlm_buf.3 ntlm_core.3 ntlm_type1.3 ntlm_type2.3 ntlm_type3.3
src/crypto/external/bsd/heimdal/dist/doc/doxyout/wind/man/man3: wind.3
src/crypto/external/bsd/heimdal/dist/include: bits.c crypto-headers.h
heim_threads.h
src/crypto/external/bsd/heimdal/dist/kadmin: ank.c cpw.c ext.c get.c
kadmind.8 kadmind.c mod.c rpc.c stash.c util.c
src/crypto/external/bsd/heimdal/dist/kcm: cache.c client.c config.c
glue.c kcm.8 protocol.c
src/crypto/external/bsd/heimdal/dist/kdc: connect.c default_config.c
digest.c hprop.8 hpropd.8 hpropd.c kdc-private.h kdc-replay.c kdc.8
kdc.h kerberos5.c krb5tgs.c kstash.8 kstash.c kx509.c pkinit-ec.c
pkinit.c string2key.8 windc_plugin.h
src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswd.c kpasswdd.8
kpasswdd.c
src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1
kdestroy.1 kdestroy.c kgetcred.1 kgetcred.c kimpersonate.8 kinit.1
kinit.c klist.1 klist.c kswitch.c
src/crypto/external/bsd/heimdal/dist/lib/asn1: asn1parse.c asn1parse.h
check-common.c check-common.h check-der.c check-gen.c
check-template.c der_cmp.c der_copy.c der_get.c der_length.c
der_put.c gen.c gen_copy.c gen_decode.c gen_free.c gen_locl.h lex.c
lex.h main.c
src/crypto/external/bsd/heimdal/dist/lib/base: bsearch.c dll.c error.c
heimbase.c
src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3
compile_et.c lex.c parse.c parse.h
src/crypto/external/bsd/heimdal/dist/lib/gssapi: gss_acquire_cred.3
gssapi.3 test_context.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
accept_sec_context.c acquire_cred.c arcfour.c cfx.c decapsulate.c
delete_sec_context.c display_status.c get_mic.c gsskrb5-private.h
init_sec_context.c unwrap.c verify_mic.c wrap.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech:
gss_display_status.c gss_import_name.c gss_mech_switch.c
gss_pname_to_uid.c mech.5 mech_locl.h
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm: creds.c crypto.c
init_sec_context.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/spnego:
accept_sec_context.c
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: bn.c des.c dh.c
engine.c engine.h evp-cc.c evp-cc.h evp-hcrypto.c evp-hcrypto.h
evp-openssl.c evp-openssl.h evp-pkcs11.c evp-pkcs11.h evp-w32.c
evp-w32.h evp-wincng.c evp-wincng.h evp.c evp.h
example_evp_cipher.c mdtest.c pkcs5.c test_bulk.c 

CVS commit: src/crypto/external/bsd/heimdal/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  1 20:40:19 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/kdc: digest.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: arcfour.c
get_mic.c unwrap.c verify_mic.c wrap.c
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: example_evp_cipher.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: ks_file.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-aes-sha1.c
crypto-arcfour.c crypto-des-common.c crypto-des.c crypto-des3.c
crypto-evp.c
src/crypto/external/bsd/heimdal/dist/lib/ntlm: ntlm.c

Log Message:
Add checks to EVP_CipherInit_ex() where they were missing and add a cheesy
define to get the RC4 cipher from the legacy provider, since the legacy
provider is not loaded by default now.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/digest.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/unwrap.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/wrap.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/example_evp_cipher.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/lib/ntlm/ntlm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
diff -u src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.3 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.4
--- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.3	Mon Feb  5 11:00:52 2018
+++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h	Thu Jun  1 16:40:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto-headers.h,v 1.3 2018/02/05 16:00:52 christos Exp $	*/
+/*	$NetBSD: crypto-headers.h,v 1.4 2023/06/01 20:40:18 christos Exp $	*/
 
 #ifndef __crypto_header__
 #define __crypto_header__
@@ -33,6 +33,9 @@
 #  define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
 #  define BN_is_negative(bn) ((bn)->neg != 0)
 # endif
+#if OPENSSL_VERSION_NUMBER >= 0x3000UL
+# define EVP_rc4() EVP_CIPHER_fetch(NULL, "rc4", "provider=legacy")
+#endif
 #endif
 
 #else /* !HAVE_HCRYPTO_W_OPENSSL */

Index: src/crypto/external/bsd/heimdal/dist/kdc/digest.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.3 src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.4
--- src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.3	Mon Feb  5 11:00:52 2018
+++ src/crypto/external/bsd/heimdal/dist/kdc/digest.c	Thu Jun  1 16:40:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: digest.c,v 1.3 2018/02/05 16:00:52 christos Exp $	*/
+/*	$NetBSD: digest.c,v 1.4 2023/06/01 20:40:18 christos Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -1368,7 +1368,9 @@ _kdc_do_digest(krb5_context context,
 #else
 	rc4 = EVP_CIPHER_CTX_new();
 #endif
-	EVP_CipherInit_ex(rc4, EVP_rc4(), NULL, sessionkey, NULL, 1);
+	if (!EVP_CipherInit_ex(rc4, EVP_rc4(), NULL, sessionkey, NULL, 1))
+		krb5_set_error_message(context, EINVAL,
+   "RC4 cipher not supported");
 	EVP_Cipher(rc4,
 		   masterkey, ireq.u.ntlmRequest.sessionkey->data,
 		   sizeof(masterkey));

Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c:1.5
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c:1.4	Sun Dec 15 17:50:47 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c	Thu Jun  1 16:40:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: arcfour.c,v 1.4 2019/12/15 22:50:47 christos Exp $	*/
+/*	$NetBSD: arcfour.c,v 1.5 2023/06/01 20:40:18 christos Exp $	*/
 
 /*
  * Copyright (c) 2003 - 2006 Kungliga Tekniska Högskolan
@@ -308,7 +308,11 @@ 

CVS commit: src/crypto/external/bsd/heimdal/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jun  1 20:40:19 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/kdc: digest.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: arcfour.c
get_mic.c unwrap.c verify_mic.c wrap.c
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: example_evp_cipher.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: ks_file.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-aes-sha1.c
crypto-arcfour.c crypto-des-common.c crypto-des.c crypto-des3.c
crypto-evp.c
src/crypto/external/bsd/heimdal/dist/lib/ntlm: ntlm.c

Log Message:
Add checks to EVP_CipherInit_ex() where they were missing and add a cheesy
define to get the RC4 cipher from the legacy provider, since the legacy
provider is not loaded by default now.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/digest.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/unwrap.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/wrap.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/example_evp_cipher.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/lib/ntlm/ntlm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/bin/hxtool

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May  9 22:12:33 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile

Log Message:
Handle OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/bin/hxtool

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue May  9 22:12:33 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/bin/hxtool: Makefile

Log Message:
Handle OpenSSL-3.x


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/bin/hxtool/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/hxtool/Makefile:1.2	Wed May 25 15:21:16 2011
+++ src/crypto/external/bsd/heimdal/bin/hxtool/Makefile	Tue May  9 18:12:33 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/05/09 22:12:33 christos Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -20,5 +20,7 @@ DPADD+= ${LIBGSSAPI}
 DPADD+= ${LIBSL}
 DPADD+= ${LIBEDIT} ${LIBTERMINFO}
 
+COPTS.hxtool.c+= -Wno-error=deprecated-declarations
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

CVS commit: src/crypto/external/bsd/heimdal/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May  8 22:17:37 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
handle OpenSSL-3 deprecations


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5	Tue Jul 10 09:17:36 2018
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile	Mon May  8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/07/10 13:17:36 martin Exp $
+# $NetBSD: Makefile,v 1.6 2023/05/08 22:17:36 christos Exp $
 
 USE_FORT?= yes# network protocol library
 
@@ -276,5 +276,13 @@ CPPFLAGS+=			\
 	-I${HEIMDIST}/lib/krb5	\
 	-I${HEIMDIST}/lib/asn1	\
 
+COPTS.krb5__get_mic.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__wrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__unwrap.c+= -Wno-error=deprecated-declarations
+COPTS.krb5__verify_mic.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__accept_sec_context.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__crypto.c+= -Wno-error=deprecated-declarations
+COPTS.ntlm__init_sec_context.c+= -Wno-error=deprecated-declarations
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3	Fri Jul  6 04:31:43 2018
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile	Mon May  8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/06 08:31:43 martin Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:36 christos Exp $
 
 USE_FORT?= yes	# cryptographic software
 
@@ -24,5 +24,7 @@ INCS=		heimntlm.h heimntlm-protos.h ${CO
 
 INCSDIR=	/usr/include/krb5
 
+COPTS.ntlm.c+= -Wno-error=deprecated-declarations
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.8
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7	Sun Jun 20 06:38:54 2021
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile	Mon May  8 18:17:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/06/20 10:38:54 christos Exp $
+# $NetBSD: Makefile,v 1.8 2023/05/08 22:17:36 christos Exp $
 
 NOLINT=		# defined
 
@@ -85,5 +85,10 @@ ASN1_FILES.ocsp.asn1 =			\
 	asn1_id_pkix_ocsp_basic.x   \
 	asn1_id_pkix_ocsp_nonce.x
 
+COPTS.cert.c += -Wno-error=deprecated-declarations
+COPTS.crypto-ec.c += -Wno-error=deprecated-declarations
+COPTS.crypto.c += -Wno-error=deprecated-declarations
+COPTS.ks_p11.c += -Wno-error=deprecated-declarations
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkafs/Makefile:1.3	Sat Jan 28 16:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkafs/Makefile	Mon May  8 18:17:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/05/08 22:17:37 christos Exp $
 
 USE_FORT?= yes	# network protocol library
 
@@ -21,5 +21,7 @@ INCS=		kafs.h
 INCSDIR=	/usr/include/krb5
 MAN=		kafs.3
 
+COPTS.rxkad_kdf.c+= -Wno-error=deprecated-declarations
+
 .include <${HEIMBASE}/Makefile.rules.inc>
 .include 

Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4	Fri Jul  6 04:54:30 2018
+++ 

CVS commit: src/crypto/external/bsd/heimdal/lib

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May  8 22:17:37 UTC 2023

Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
src/crypto/external/bsd/heimdal/lib/libkafs: Makefile
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile

Log Message:
handle OpenSSL-3 deprecations


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkafs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/dist/lib/base

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Oct 28 18:12:54 UTC 2019

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/base: error.c

Log Message:
Merge 85acd57c8a288ce92f42bcf62737eebe385bce90 from Heimdal on Github:

Fix the numeric error value comparison performed by error_cmp().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/base/error.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/dist/lib/base

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Oct 28 18:12:54 UTC 2019

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/base: error.c

Log Message:
Merge 85acd57c8a288ce92f42bcf62737eebe385bce90 from Heimdal on Github:

Fix the numeric error value comparison performed by error_cmp().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/base/error.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/lib/base/error.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.2	Sat Jan 28 21:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/base/error.c	Mon Oct 28 18:12:54 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: error.c,v 1.2 2017/01/28 21:31:45 christos Exp $	*/
+/*	$NetBSD: error.c,v 1.3 2019/10/28 18:12:54 joerg Exp $	*/
 
 /*
  * Copyright (c) 2010 Kungliga Tekniska Högskolan
@@ -55,8 +55,8 @@ static int
 error_cmp(void *a, void *b)
 {
 struct heim_error *ap = a, *bp = b;
-if (ap->error_code == ap->error_code)
-	return ap->error_code - ap->error_code;
+if (ap->error_code == bp->error_code)
+	return 0;
 return heim_cmp(ap->msg, bp->msg);
 }
 

CVS commit: src/crypto/external/bsd/heimdal/dist/kuser

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Oct 19 15:55:51 UTC 2019

Modified Files:
src/crypto/external/bsd/heimdal/dist/kuser: kinit.c

Log Message:
- factor out common code
- use llabs because time_t can be long long.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kuser/kinit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/crypto/external/bsd/heimdal/dist/kuser

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sat Oct 19 15:55:51 UTC 2019

Modified Files:
src/crypto/external/bsd/heimdal/dist/kuser: kinit.c

Log Message:
- factor out common code
- use llabs because time_t can be long long.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kuser/kinit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/kuser/kinit.c
diff -u src/crypto/external/bsd/heimdal/dist/kuser/kinit.c:1.2 src/crypto/external/bsd/heimdal/dist/kuser/kinit.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kuser/kinit.c:1.2	Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/kuser/kinit.c	Sat Oct 19 11:55:50 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: kinit.c,v 1.2 2017/01/28 21:31:45 christos Exp $	*/
+/*	$NetBSD: kinit.c,v 1.3 2019/10/19 15:55:50 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
@@ -711,18 +711,18 @@ get_new_tickets(krb5_context context,
 }
 
 if (ticket_life != 0) {
-	if (labs(cred.times.endtime - cred.times.starttime - ticket_life) > 30) {
+	krb5_deltat d = cred.times.endtime - cred.times.starttime;
+	if (llabs(d - ticket_life) > 30) {
 	char life[64];
-	unparse_time_approx(cred.times.endtime - cred.times.starttime,
-life, sizeof(life));
+	unparse_time_approx(d, life, sizeof(life));
 	krb5_warnx(context, N_("NOTICE: ticket lifetime is %s", ""), life);
 	}
 }
 if (renew_life) {
-	if (labs(cred.times.renew_till - cred.times.starttime - renew) > 30) {
+	krb5_deltat d = cred.times.renew_till - cred.times.starttime;
+	if (llabs(d - renew) > 30) {
 	char life[64];
-	unparse_time_approx(cred.times.renew_till - cred.times.starttime,
-life, sizeof(life));
+	unparse_time_approx(d, life, sizeof(life));
 	krb5_warnx(context,
 		   N_("NOTICE: ticket renewable lifetime is %s", ""),
 		   life);