CVS commit: src/crypto/external/bsd/heimdal
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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/hx509
Module Name:src
Committed By: christos
Date: Sun Jun 20 12:01:07 UTC 2021
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.y sel-lex.l
sel.c sel.h
Removed Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.c sel-gram.h
sel-lex.c
Log Message:
remove generated files, custom #define prefixes to hide lex/yacc symbols
and yywrap.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.h \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.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/lib/hx509/sel-gram.y
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-gram.y,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-gram.y,v 1.4 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2017 Kungliga Tekniska Högskolan
@@ -41,19 +41,6 @@
#include
#include
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
-#define yyparse _hx509_sel_yyparse
-#define yyerror _hx509_sel_yyerror
-#define yylval _hx509_sel_yylval
-#define yychar _hx509_sel_yychar
-#define yydebug _hx509_sel_yydebug
-#define yynerrs _hx509_sel_yynerrs
-#endif
-
%}
%union {
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-lex.l,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-lex.l,v 1.4 2021/06/20 12:01:07 christos Exp $ */
%{
/*
@@ -72,6 +72,8 @@ struct hx_expr_input _hx509_expr_input;
#undef ECHO
%}
+
+%option noyywrap
%%
TRUE { return kw_TRUE; }
@@ -82,12 +84,12 @@ IN { return kw_IN; }
TAILMATCH { return kw_TAILMATCH; }
[A-Za-z][-A-Za-z0-9_]* {
- yylval.string = strdup ((const char *)yytext);
+ _hx509_sel_yylval.string = strdup ((const char *)_hx509_sel_yytext);
return IDENTIFIER;
}
-"\"" { yylval.string = handle_string(); return STRING; }
+"\"" { _hx509_sel_yylval.string = handle_string(); return STRING; }
\n { ++lineno; }
-[,.!={}()%] { return *yytext; }
+[,.!={}()%] { return *_hx509_sel_yytext; }
[ \t] ;
%%
@@ -122,16 +124,6 @@ handle_string(void)
return strdup(x);
}
-#if !defined(yywrap)
-#define yywrap _hx509_sel_yywrap
-#endif
-
-int
-yywrap ()
-{
- return 1;
-}
-
static int
lex_input(char *buf, int max_size)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 Sat Jan 28 16:31:48 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.c,v 1.2 2017/01/28 21:31:48 christos Exp $ */
+/* $NetBSD: sel.c,v 1.3 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -219,7 +219,7 @@ _hx509_expr_parse(const char *buf)
_hx509_expr_input.error = NULL;
}
-yyparse();
+_hx509_sel_yyparse();
return _hx509_expr_input.expr;
}
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.6
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.h,v 1.5 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel.h,v 1.6 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -69,20 +69,6 @@ struct hx_expr_input {
extern struct hx_expr_input _hx509_expr_input;
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/hx509
Module Name:src Committed By: christos Date: Sun Jun 20 12:01:07 UTC 2021 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.y sel-lex.l sel.c sel.h Removed Files: src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.c sel-gram.h sel-lex.c Log Message: remove generated files, custom #define prefixes to hide lex/yacc symbols and yywrap. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.c \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.h \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.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/lib/libhx509
Module Name:src Committed By: christos Date: Sun Jun 20 10:38:54 UTC 2021 Modified Files: src/crypto/external/bsd/heimdal/lib/libhx509: Makefile Log Message: hide yyerrflag, yyval; centralize lex and yacc settings To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/lib/libhx509/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/libhx509
Module Name:src
Committed By: christos
Date: Sun Jun 20 10:38:54 UTC 2021
Modified Files:
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
Log Message:
hide yyerrflag, yyval; centralize lex and yacc settings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/lib/libhx509/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/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.6 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.6 Sat Feb 3 22:19:51 2018
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Sun Jun 20 06:38:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/04 03:19:51 christos Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/20 10:38:54 christos Exp $
NOLINT= # defined
@@ -19,6 +19,8 @@ LIBDPLIBS+= asn1 ${HEIMBASE}/lib/libasn1
wind ${HEIMBASE}/lib/libwind
YHEADER=1
+YPREFIX= _hx509_sel_yy
+LPREFIX= _hx509_sel_yy
INCSDIR= /usr/include/krb5
INCS+= hx509.h hx509-protos.h ${ASN1_INCS} ${COMPILE_ET_INCS}
@@ -56,7 +58,6 @@ SRCS=\
softp11.c \
${BUILT_SOURCES}
-LPREFIX= _hx509_sel_yy
CPPFLAGS+=\
-I${HEIMDIST}/lib/hx509/ref \
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: mrg
Date: Thu Jul 23 07:53:35 UTC 2020
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
move $VERSION from Makefile.inc into the single Makefile that uses it.
this should do two nice things:
- eliminate "nbsed" missing messages in builds
- slightly speed up the build by removing a few dozen exec sed calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/krb5-config/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.5 src/crypto/external/bsd/heimdal/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.5 Tue Dec 17 00:17:00 2019
+++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -16,8 +16,6 @@ LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
.endif
-VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
-
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
TOOL_COMPILE_ET= ${COMPILEETOBJ}/compile_et
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 Tue Dec 17 00:16:26 2019
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/07/23 07:53:35 mrg Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,8 @@ MAN= krb5-config.1
CLEANFILES+= krb5-config
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${HEIMBASE}/include/config.h
+
krb5-config: krb5-config.in
${TOOL_SED} \
-e "s!@PACKAGE\@!heimdal!g" \
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: mrg Date: Thu Jul 23 07:53:35 UTC 2020 Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile Log Message: move $VERSION from Makefile.inc into the single Makefile that uses it. this should do two nice things: - eliminate "nbsed" missing messages in builds - slightly speed up the build by removing a few dozen exec sed calls To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.inc cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/bin/krb5-config/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
Module Name:src
Committed By: christos
Date: Tue Dec 17 00:17:00 UTC 2019
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
Log Message:
Find and set a version to a make(1) variable.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/Makefile.inc
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.4 src/crypto/external/bsd/heimdal/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.4 Sat Feb 3 22:19:51 2018
+++ src/crypto/external/bsd/heimdal/Makefile.inc Mon Dec 16 19:17:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/02/04 03:19:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -16,6 +16,8 @@ LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
.endif
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
+
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
TOOL_COMPILE_ET= ${COMPILEETOBJ}/compile_et
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: christos Date: Tue Dec 17 00:17:00 UTC 2019 Modified Files: src/crypto/external/bsd/heimdal: Makefile.inc Log Message: Find and set a version to a make(1) variable. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/Makefile.inc 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/krb5-config
Module Name:src
Committed By: christos
Date: Tue Dec 17 00:16:26 UTC 2019
Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
PR/54773: David Shao: krb5-config.in needs to be evaluated by the shell now
in order to work. Perhaps it is better to keep a local modified copy that
does not need this treatment...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/krb5-config/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/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3 Thu Apr 24 09:50:53 2014
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Mon Dec 16 19:16:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,8 +11,9 @@ MAN= krb5-config.1
CLEANFILES+= krb5-config
krb5-config: krb5-config.in
- ${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \
- -e "s!@VERSION\@!1.5.3!g" \
+ ${TOOL_SED} \
+ -e "s!@PACKAGE\@!heimdal!g" \
+ -e "s!@VERSION\@!${VERSION}!g" \
-e "s!@prefix\@!/!g" \
-e "s!@exec_prefix\@!/!g" \
-e "s!@libdir\@!/usr/lib!g" \
@@ -26,7 +27,7 @@ krb5-config: krb5-config.in
-e "s!@LIB_pkinit\@!-lhx509!g" \
-e "s!@PTHREAD_LIBADD\@!!g" \
-e "s!@LIBS\@!!g" \
- ${HEIMDIST}/tools/krb5-config.in > $@
+ ${HEIMDIST}/tools/krb5-config.in | sh > $@
chmod +x $@
.include
CVS commit: src/crypto/external/bsd/heimdal/bin/krb5-config
Module Name:src Committed By: christos Date: Tue Dec 17 00:16:26 UTC 2019 Modified Files: src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile Log Message: PR/54773: David Shao: krb5-config.in needs to be evaluated by the shell now in order to work. Perhaps it is better to keep a local modified copy that does not need this treatment... To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/bin/krb5-config/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
Module Name:src Committed By: christos Date: Sun Dec 15 22:50:52 UTC 2019 Modified Files: src/crypto/external/bsd/heimdal: heimdal2netbsd src/crypto/external/bsd/heimdal/dist: NEWS configure.ac 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: gss_add_oid_set_member.3 gss_canonicalize_name.3 gss_display_status.3 gss_export_name.3 gss_import_name.3 gss_init_sec_context.3 gss_inquire_attrs_for_mech.3 gss_inquire_saslname_for_mech.3 gss_oid_equal.3 gss_release_cred.3 gss_release_iov_buffer.3 gss_release_name.3 gss_unwrap_iov.3 gss_wrap.3 gss_wrap_iov.3 gss_wrap_iov_length.3 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: DES_cbc_cksum.3 DES_cbc_encrypt.3 DES_cfb64_encrypt.3 DES_check_key_parity.3 DES_ecb3_encrypt.3 DES_ecb_encrypt.3 DES_ede3_cbc_encrypt.3 DES_encrypt.3 DES_init_random_number_generator.3 DES_is_weak_key.3 DES_key_sched.3 DES_new_random_key.3 DES_pcbc_encrypt.3 DES_random_key.3 DES_set_key.3 DES_set_key_checked.3 DES_set_key_unchecked.3 DES_set_odd_parity.3 DES_string_to_key.3 DH_check_pubkey.3 DH_compute_key.3 DH_free.3 DH_generate_key.3 DH_generate_parameters_ex.3 DH_get_default_method.3 DH_get_ex_data.3 DH_ltm_method.3 DH_new.3 DH_new_method.3 DH_null_method.3 DH_set_default_method.3 DH_set_ex_data.3 DH_set_method.3 DH_size.3 DH_up_ref.3 EVP_BytesToKey.3 EVP_CIPHER_CTX_block_size.3 EVP_CIPHER_CTX_cipher.3 EVP_CIPHER_CTX_cleanup.3 EVP_CIPHER_CTX_ctrl.3 EVP_CIPHER_CTX_flags.3 EVP_CIPHER_CTX_get_app_data.3 EVP_CIPHER_CTX_init.3 EVP_CIPHER_CTX_iv_length.3 EVP_CIPHER_CTX_key_length.3 EVP_CIPHER_CTX_mode.3 EVP_CIPHER_CTX_rand_key.3 EVP_CIPHER_CTX_set_app_data.3 EVP_CIPHER_CTX_set_key_length.3 EVP_CIPHER_block_size.3 EVP_CIPHER_iv_length.3 EVP_CIPHER_key_length.3 EVP_CipherFinal_ex.3 EVP_CipherInit_ex.3 EVP_CipherUpdate.3 EVP_Digest.3 EVP_DigestFinal_ex.3 EVP_DigestInit_ex.3 EVP_DigestUpdate.3 EVP_MD_CTX_block_size.3 EVP_MD_CTX_cleanup.3 EVP_MD_CTX_create.3 EVP_MD_CTX_destroy.3 EVP_MD_CTX_init.3 EVP_MD_CTX_md.3 EVP_MD_CTX_size.3 EVP_MD_block_size.3 EVP_MD_size.3 EVP_aes_128_cbc.3 EVP_aes_128_cfb8.3 EVP_aes_192_cbc.3 EVP_aes_192_cfb8.3 EVP_aes_256_cbc.3 EVP_aes_256_cfb8.3 EVP_camellia_128_cbc.3 EVP_camellia_192_cbc.3 EVP_camellia_256_cbc.3 EVP_des_cbc.3 EVP_des_ede3_cbc.3 EVP_enc_null.3 EVP_get_cipherbyname.3 EVP_hcrypto_aes_128_cbc.3 EVP_hcrypto_aes_128_cfb8.3 EVP_hcrypto_aes_192_cbc.3 EVP_hcrypto_aes_192_cfb8.3 EVP_hcrypto_aes_256_cbc.3 EVP_hcrypto_aes_256_cfb8.3 EVP_hcrypto_camellia_128_cbc.3 EVP_hcrypto_camellia_192_cbc.3 EVP_hcrypto_camellia_256_cbc.3 EVP_hcrypto_des_cbc.3 EVP_hcrypto_des_ede3_cbc.3 EVP_hcrypto_md2.3 EVP_hcrypto_md4.3 EVP_hcrypto_md5.3 EVP_hcrypto_rc2_40_cbc.3 EVP_hcrypto_rc2_64_cbc.3 EVP_hcrypto_rc2_cbc.3 EVP_hcrypto_sha1.3 EVP_hcrypto_sha256.3 EVP_hcrypto_sha384.3 EVP_hcrypto_sha512.3 EVP_md2.3 EVP_md4.3 EVP_md5.3 EVP_md_null.3 EVP_rc2_40_cbc.3 EVP_rc2_64_cbc.3 EVP_rc2_cbc.3 EVP_rc4.3 EVP_rc4_40.3 EVP_sha.3 EVP_sha1.3 EVP_sha256.3 EVP_sha384.3 EVP_sha512.3 EVP_wincrypt_des_ede3_cbc.3 OSSL_CIPHER_ALGORITHM.3 OpenSSL_add_all_algorithms.3 OpenSSL_add_all_algorithms_conf.3 OpenSSL_add_all_algorithms_noconf.3 PKCS5_PBKDF2_HMAC.3 PKCS5_PBKDF2_HMAC_SHA1.3 RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_file_name.3 RAND_get_rand_method.3 RAND_load_file.3 RAND_pseudo_bytes.3 RAND_seed.3 RAND_set_rand_engine.3 RAND_set_rand_method.3 RAND_status.3 RAND_write_file.3 RSA_free.3 RSA_get_app_data.3 RSA_get_method.3 RSA_new.3 RSA_new_method.3 RSA_set_app_data.3 RSA_set_method.3 RSA_up_ref.3 WINCNG_CIPHER_ALGORITHM.3 WINCNG_CIPHER_ALGORITHM_UNAVAILABLE.3 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__del.3 hdb__get.3 hdb__put.3 hdb_auth_status.3 hdb_check_constrained_delegation.3 hdb_check_pkinit_ms_upn_match.3 hdb_check_s4u2self.3 hdb_close.3
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/base
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
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
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
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);
CVS commit: src/crypto/external/bsd/heimdal/lib/libkadm5srv
Module Name:src
Committed By: martin
Date: Thu Jul 12 11:13:50 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
Log Message:
Provide an explicit dependency on heimbase
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/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/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Thu Jul 12 11:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/12 11:13:50 martin Exp $
USE_FORT?= yes # network protocol library
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
com_err ${.CURDIR}/../libcom_err \
hdb ${.CURDIR}/../libhdb \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ heimbase ${.CURDIR}/../libheimbase
HEIMSRCS= kadm5_err.et
CVS commit: src/crypto/external/bsd/heimdal/lib/libkadm5srv
Module Name:src Committed By: martin Date: Thu Jul 12 11:13:50 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile Log Message: Provide an explicit dependency on heimbase To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/lib/libkadm5srv/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/libgssapi
Module Name:src
Committed By: martin
Date: Tue Jul 10 13:17:36 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
Log Message:
Explicit heimbase dependency (similar to other recent MKREPRO fixes)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libgssapi/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.4 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 Thu Apr 24 13:50:53 2014
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Tue Jul 10 13:17:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/10 13:17:36 martin Exp $
USE_FORT?= yes# network protocol library
@@ -17,6 +17,7 @@ LIBDPLIBS+= krb5 ${HEIMBASE}/lib/libkrb
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
+ heimbase ${HEIMBASE}/lib/libheimbase \
heimntlm ${HEIMBASE}/lib/libheimntlm \
crypto ${SSLBASE}/lib/libcrypto
CVS commit: src/crypto/external/bsd/heimdal/lib/libgssapi
Module Name:src Committed By: martin Date: Tue Jul 10 13:17:36 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile Log Message: Explicit heimbase dependency (similar to other recent MKREPRO fixes) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/lib/libgssapi/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/libkdc
Module Name:src
Committed By: martin
Date: Fri Jul 6 08:54:30 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
Log Message:
Explicit libheimbase dependency, similar to Christos' change to
libheimntlm/Makefile, hopefully fixing another MKREPRO fallout.
XXX pullup 8
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkdc/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/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Fri Jul 6 08:54:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/06 08:54:30 martin Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -15,6 +15,7 @@ LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5
hdb ${.CURDIR}/../libhdb \
hx509 ${.CURDIR}/../libhx509 \
asn1 ${.CURDIR}/../libasn1 \
+ heimbase ${.CURDIR}/../libheimbase \
heimntlm ${.CURDIR}/../libheimntlm \
roken ${.CURDIR}/../libroken
CVS commit: src/crypto/external/bsd/heimdal/lib/libkdc
Module Name:src Committed By: martin Date: Fri Jul 6 08:54:30 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/lib/libkdc: Makefile Log Message: Explicit libheimbase dependency, similar to Christos' change to libheimntlm/Makefile, hopefully fixing another MKREPRO fallout. XXX pullup 8 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkdc/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/libheimntlm
Module Name:src
Committed By: martin
Date: Fri Jul 6 08:31:43 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
Log Message:
Add explicit path to libwind - patch from Christos, may fix some MKREPRO
fallout. XXX pullup 8
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/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/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Fri Jul 6 08:31:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/06 08:31:43 martin Exp $
USE_FORT?= yes # cryptographic software
@@ -15,7 +15,8 @@ LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
com_err ${.CURDIR}/../libcom_err \
crypto ${SSLBASE}/lib/libcrypto \
krb5 ${.CURDIR}/../libkrb5 \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ wind ${.CURDIR}/../libwind
HEIMSRCS= ntlm_err.et ntlm.c
CVS commit: src/crypto/external/bsd/heimdal/lib/libheimntlm
Module Name:src Committed By: martin Date: Fri Jul 6 08:31:43 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile Log Message: Add explicit path to libwind - patch from Christos, may fix some MKREPRO fallout. XXX pullup 8 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/lib/libheimntlm/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/krb5
Module Name:src
Committed By: kamil
Date: Sat Jun 16 18:51:36 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c
Log Message:
Do not reference buffer after the code scope {}
rk_getpwuid_r() returns a pointer pwd->pw_dir to a buffer pwbuf[].
It's not safe to store another a copy of pwd->pw_dir in outter scope and
use it out of the scope where there exists pwbuf[].
This fixes a problem reported by ASan under MKSANITIZER.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.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/krb5
Module Name:src
Committed By: kamil
Date: Sat Jun 16 18:51:36 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c
Log Message:
Do not reference buffer after the code scope {}
rk_getpwuid_r() returns a pointer pwd->pw_dir to a buffer pwbuf[].
It's not safe to store another a copy of pwd->pw_dir in outter scope and
use it out of the scope where there exists pwbuf[].
This fixes a problem reported by ASan under MKSANITIZER.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.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/krb5/config_file.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.3 Fri Sep 8 15:29:43 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c Sat Jun 16 18:51:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: config_file.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
+/* $NetBSD: config_file.c,v 1.4 2018/06/16 18:51:36 kamil Exp $ */
/*
* Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
@@ -430,6 +430,8 @@ krb5_config_parse_file_multi (krb5_conte
if (ISTILDE(fname[0]) && ISPATHSEP(fname[1])) {
#ifndef KRB5_USE_PATH_TOKENS
const char *home = NULL;
+ struct passwd pw, *pwd = NULL;
+ char pwbuf[2048];
if (!_krb5_homedir_access(context)) {
krb5_set_error_message(context, EPERM,
@@ -441,9 +443,6 @@ krb5_config_parse_file_multi (krb5_conte
home = getenv("HOME");
if (home == NULL) {
- struct passwd pw, *pwd = NULL;
- char pwbuf[2048];
-
if (rk_getpwuid_r(getuid(), , pwbuf, sizeof(pwbuf), ) == 0)
home = pwd->pw_dir;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: spz Date: Sun Apr 29 05:36:04 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: connect.c Log Message: avoid busy-waiting on a dead child To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/connect.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/kdc
Module Name:src
Committed By: spz
Date: Sun Apr 29 05:36:04 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: connect.c
Log Message:
avoid busy-waiting on a dead child
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/connect.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/kdc/connect.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.2 src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.2 Sat Jan 28 21:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kdc/connect.c Sun Apr 29 05:36:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: connect.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: connect.c,v 1.3 2018/04/29 05:36:04 spz Exp $ */
/*
* Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -1193,7 +1193,7 @@ start_kdc(krb5_context context,
break;
default:
for (i=0; i < max_kdcs; i++) {
-if (pids[i] == 0) {
+if (pids[i] < 1) {
pids[i] = pid;
break;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src Committed By: christos Date: Fri Apr 6 19:57:03 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kcm: glue.c Log Message: - use c99 initializers - add kdc offset functions To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/glue.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/kcm
Module Name:src
Committed By: christos
Date: Fri Apr 6 19:57:03 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: glue.c
Log Message:
- use c99 initializers
- add kdc offset functions
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/glue.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/kcm/glue.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/glue.c Fri Apr 6 15:57:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -34,7 +34,7 @@
#include "kcm_locl.h"
-__RCSID("$NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
+__RCSID("$NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $");
/*
* Server-side loopback glue for credentials cache operations; this
@@ -248,33 +248,60 @@ kcmss_get_version(krb5_context context,
return 0;
}
+static krb5_error_code
+kcmss_get_kdc_sec_offset(krb5_context context,
+ krb5_ccache id,
+ krb5_deltat *t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+*t = c->kdc_offset;
+
+return 0;
+}
+
+static krb5_error_code
+kcmss_set_kdc_sec_offset(krb5_context context,
+ krb5_ccache id, krb5_deltat t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+c->kdc_offset = t;
+
+return 0;
+}
+
static const krb5_cc_ops krb5_kcmss_ops = {
-KRB5_CC_OPS_VERSION,
-"KCM",
-kcmss_get_name,
-kcmss_resolve,
-kcmss_gen_new,
-kcmss_initialize,
-kcmss_destroy,
-kcmss_close,
-kcmss_store_cred,
-kcmss_retrieve,
-kcmss_get_principal,
-kcmss_get_first,
-kcmss_get_next,
-kcmss_end_get,
-kcmss_remove_cred,
-kcmss_set_flags,
-kcmss_get_version,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
+.version = KRB5_CC_OPS_VERSION,
+.prefix = "KCM",
+.get_name = kcmss_get_name,
+.resolve = kcmss_resolve,
+.gen_new = kcmss_gen_new,
+.init = kcmss_initialize,
+.destroy = kcmss_destroy,
+.close = kcmss_close,
+.store = kcmss_store_cred,
+.retrieve = kcmss_retrieve,
+.get_princ = kcmss_get_principal,
+.get_first = kcmss_get_first,
+.get_next = kcmss_get_next,
+.end_get = kcmss_end_get,
+.remove_cred = kcmss_remove_cred,
+.set_flags = kcmss_set_flags,
+.get_version = kcmss_get_version,
+.get_cache_first = NULL,
+.get_cache_next = NULL,
+.end_cache_get = NULL,
+.move = NULL,
+.get_default_name = NULL,
+.set_default = NULL,
+.lastchange = NULL,
+.set_kdc_offset = kcmss_set_kdc_sec_offset,
+.get_kdc_offset = kcmss_get_kdc_sec_offset,
};
krb5_error_code
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src Committed By: christos Date: Fri Apr 6 19:56:43 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kcm: cache.c Log Message: don't forget to initialize the kdc_offset (it was random before) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kcm/cache.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/kcm/cache.c diff -u src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.4 --- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3 Sat Jan 28 16:31:44 2017 +++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c Fri Apr 6 15:56:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.3 2017/01/28 21:31:44 christos Exp $ */ +/* $NetBSD: cache.c,v 1.4 2018/04/06 19:56:43 christos Exp $ */ /* * Copyright (c) 2005, PADL Software Pty Ltd. @@ -324,6 +324,7 @@ kcm_ccache_alloc(krb5_context context, slot->key.keytab = NULL; slot->tkt_life = 0; slot->renew_life = 0; +slot->kdc_offset = 0; if (new_slot) ccache_head = slot;
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src Committed By: christos Date: Fri Apr 6 19:56:43 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kcm: cache.c Log Message: don't forget to initialize the kdc_offset (it was random before) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kcm/cache.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
Module Name:src
Committed By: mrg
Date: Tue Mar 13 03:06:51 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
add *template.x to CLEANFILES.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.rules.inc
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.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8 Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Tue Mar 13 03:06:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.8 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile.rules.inc,v 1.9 2018/03/13 03:06:51 mrg Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -23,6 +23,7 @@ ASN1_OPTS.${src} ?= --one-code-file
CLEANFILES+=\
${src:.asn1=_asn1_files} \
${src:.asn1=_asn1-template.c} \
+ ${src:.asn1=_asn1-template.x} \
${ASN1_FILES.${src}} \
${ASN1_FILES.${src}:.x=.c} \
${src:.asn1=_asn1.h} \
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: mrg Date: Tue Mar 13 03:06:51 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal: Makefile.rules.inc Log Message: add *template.x to CLEANFILES. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.rules.inc 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
Module Name:src Committed By: christos Date: Fri Feb 9 23:22:13 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: pkinit.c src/crypto/external/bsd/heimdal/dist/lib/krb5: pkinit.c Log Message: fix BN_to_integer to get rid of __UNCONST. Trick question: How many BN_to_integer implementations does Heimdal contain (I only fixed 2). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.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
Module Name:src
Committed By: christos
Date: Fri Feb 9 23:22:13 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: pkinit.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: pkinit.c
Log Message:
fix BN_to_integer to get rid of __UNCONST. Trick question:
How many BN_to_integer implementations does Heimdal contain (I only fixed 2).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.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/kdc/pkinit.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.3 src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.4
--- src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.3 Mon Feb 5 11:00:52 2018
+++ src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c Fri Feb 9 18:22:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pkinit.c,v 1.3 2018/02/05 16:00:52 christos Exp $ */
+/* $NetBSD: pkinit.c,v 1.4 2018/02/09 23:22:12 christos Exp $ */
/*
* Copyright (c) 2003 - 2016 Kungliga Tekniska Högskolan
@@ -813,7 +813,7 @@ out:
*/
static krb5_error_code
-BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
+BN_to_integer(krb5_context context, const BIGNUM *bn, heim_integer *integer)
{
integer->length = BN_num_bytes(bn);
integer->data = malloc(integer->length);
@@ -1038,7 +1038,7 @@ pk_mk_pa_reply_dh(krb5_context context,
#else
DH_get0_key(kdc_dh, _key, NULL);
#endif
- ret = BN_to_integer(context, __UNCONST(pub_key), );
+ ret = BN_to_integer(context, pub_key, );
if (ret)
return ret;
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.3 Mon Feb 5 11:00:53 2018
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c Fri Feb 9 18:22:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pkinit.c,v 1.3 2018/02/05 16:00:53 christos Exp $ */
+/* $NetBSD: pkinit.c,v 1.4 2018/02/09 23:22:13 christos Exp $ */
/*
* Copyright (c) 2003 - 2016 Kungliga Tekniska Högskolan
@@ -82,7 +82,7 @@ _krb5_pk_cert_free(struct krb5_pk_cert *
}
static krb5_error_code
-BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
+BN_to_integer(krb5_context context, const BIGNUM *bn, heim_integer *integer)
{
integer->length = BN_num_bytes(bn);
integer->data = malloc(integer->length);
@@ -481,12 +481,12 @@ build_auth_pack(krb5_context context,
DH_get0_pqg(dh, , , );
#endif
- ret = BN_to_integer(context, __UNCONST(p), );
+ ret = BN_to_integer(context, p, );
if (ret) {
free_DomainParameters();
return ret;
}
- ret = BN_to_integer(context, __UNCONST(g), );
+ ret = BN_to_integer(context, g, );
if (ret) {
free_DomainParameters();
return ret;
@@ -496,7 +496,7 @@ build_auth_pack(krb5_context context,
free_DomainParameters();
return ENOMEM;
}
- ret = BN_to_integer(context, __UNCONST(q), dp.q);
+ ret = BN_to_integer(context, q, dp.q);
if (ret) {
free_DomainParameters();
return ret;
@@ -527,7 +527,7 @@ build_auth_pack(krb5_context context,
#else
DH_get0_key(dh, _key, NULL);
#endif
- ret = BN_to_integer(context, __UNCONST(pub_key), _pub_key);
+ ret = BN_to_integer(context, pub_key, _pub_key);
if (ret)
return ret;
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src
Committed By: christos
Date: Mon Feb 5 16:00:53 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/kdc: digest.c kx509.c pkinit.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/gssapi/ntlm: crypto.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: crypto.c hxtool.c
ks_file.c ks_p11.c
src/crypto/external/bsd/heimdal/dist/lib/kafs: rxkad_kdf.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 crypto.h pkinit.c sp800-108-kdf.c
src/crypto/external/bsd/heimdal/dist/lib/ntlm: ntlm.c
Log Message:
port to openssl-1.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/digest.c \
src/crypto/external/bsd/heimdal/dist/kdc/kx509.c \
src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c \
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.3 -r1.4 \
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/gssapi/ntlm/crypto.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/crypto.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/hxtool.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_p11.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/kafs/rxkad_kdf.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto.h \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/sp800-108-kdf.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
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.2 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.3
--- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h Mon Feb 5 11:00:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto-headers.h,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: crypto-headers.h,v 1.3 2018/02/05 16:00:52 christos Exp $ */
#ifndef __crypto_header__
#define __crypto_header__
@@ -28,9 +28,11 @@
#include
#include
#include
-#ifndef BN_is_negative
-#define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
-#define BN_is_negative(bn) ((bn)->neg != 0)
+#if OPENSSL_VERSION_NUMBER < 0x1010UL
+# ifndef BN_is_negative
+# define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
+# define BN_is_negative(bn) ((bn)->neg != 0)
+# 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.2 src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kdc/digest.c Mon Feb 5 11:00:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: digest.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: digest.c,v 1.3 2018/02/05 16:00:52 christos Exp $ */
/*
* Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -377,8 +377,8 @@ _kdc_do_digest(krb5_context context,
case choice_DigestReqInner_init: {
unsigned char server_nonce[16], identifier;
- RAND_pseudo_bytes(, sizeof(identifier));
- RAND_pseudo_bytes(server_nonce, sizeof(server_nonce));
+ RAND_bytes(, sizeof(identifier));
+ RAND_bytes(server_nonce, sizeof(server_nonce));
server_nonce[0] = kdc_time & 0xff;
server_nonce[1] = (kdc_time >> 8) & 0xff;
@@ -1340,7 +1340,7 @@ _kdc_do_digest(krb5_context
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src Committed By: christos Date: Mon Feb 5 16:00:53 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h src/crypto/external/bsd/heimdal/dist/kdc: digest.c kx509.c pkinit.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/gssapi/ntlm: crypto.c src/crypto/external/bsd/heimdal/dist/lib/hx509: crypto.c hxtool.c ks_file.c ks_p11.c src/crypto/external/bsd/heimdal/dist/lib/kafs: rxkad_kdf.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 crypto.h pkinit.c sp800-108-kdf.c src/crypto/external/bsd/heimdal/dist/lib/ntlm: ntlm.c Log Message: port to openssl-1.1 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/digest.c \ src/crypto/external/bsd/heimdal/dist/kdc/kx509.c \ src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c \ 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.3 -r1.4 \ 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/gssapi/ntlm/crypto.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/hx509/crypto.c \ src/crypto/external/bsd/heimdal/dist/lib/hx509/hxtool.c \ src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c \ src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_p11.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/kafs/rxkad_kdf.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto.h \ src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/sp800-108-kdf.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c cvs rdiff -u -r1.1.1.3 -r1.2 \ 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
Module Name:src Committed By: christos Date: Fri Sep 8 15:29:44 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist: configure.ac src/crypto/external/bsd/heimdal/dist/kcm: client.c config.c src/crypto/external/bsd/heimdal/dist/lib/hx509: softp11.c src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c get_default_principal.c src/crypto/external/bsd/heimdal/dist/lib/roken: getxxyyy.c roken.h.in src/crypto/external/bsd/heimdal/include: config.h roken.h Added Files: src/crypto/external/bsd/heimdal/dist/cf: check-getpwuid_r-posix.m4 Log Message: Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal buffers. kde does (kdm/client/backend.c): p = getpwnam(); pam_setcred() (which calls getpwuid in pam_afslog); setusercontext(...,p,p->pw_uid,...) (now with trashed p data...) XXX: pullups. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/configure.ac cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4 cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/client.c \ src/crypto/external/bsd/heimdal/dist/kcm/config.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/include/config.h cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/include/roken.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
Module Name:src
Committed By: christos
Date: Fri Sep 8 15:29:44 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c
get_default_principal.c
src/crypto/external/bsd/heimdal/dist/lib/roken: getxxyyy.c roken.h.in
src/crypto/external/bsd/heimdal/include: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf: check-getpwuid_r-posix.m4
Log Message:
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)
XXX: pullups.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/include/roken.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/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.2 src/crypto/external/bsd/heimdal/dist/configure.ac:1.3
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.2 Sat Jan 28 16:31:43 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac Fri Sep 8 11:29:43 2017
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.2 $)
+AC_REVISION($Revision: 1.3 $)
AC_PREREQ(2.62)
test -z "$CFLAGS" && CFLAGS="-g"
AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
rk_DLADDR
AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
dnl detect doors on solaris
if test "$enable_pthread_support" != no; then
Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c Fri Sep 8 11:29:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: client.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8 +174,10 @@ kcm_ccache_new_client(krb5_context conte
if (matches == 0)
matches = sscanf(name,"%ld",);
if (matches == 1) {
- struct passwd *pwd = getpwuid(uid);
- if (pwd != NULL) {
+ struct passwd pw, *pwd = NULL;
+ char pwbuf[2048];
+
+ if (rk_getpwuid_r(getuid(), , pwbuf, sizeof(pwbuf), ) == 0) {
gid_t gid = pwd->pw_gid;
kcm_chown(context, client, ccache, uid, gid);
}
Index: src/crypto/external/bsd/heimdal/dist/kcm/config.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/config.c Fri Sep 8 11:29:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: config.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -159,28 +159,33 @@ static int parse_owners(kcm_ccache ccach
{
uid_t uid = 0;
gid_t gid = 0;
-struct passwd *pw;
struct group *gr;
int uid_p = 0;
int gid_p = 0;
+struct passwd pw, *pwd = NULL;
+char pwbuf[2048];
if (system_user != NULL) {
if (isdigit((unsigned char)system_user[0])) {
- pw = getpwuid(atoi(system_user));
+ if (rk_getpwuid_r(atoi(system_user), , pwbuf, sizeof(pwbuf),
+ ) != 0)
+ pwd = NULL;
} else {
- pw = getpwnam(system_user);
+ if (rk_getpwnam_r(system_user, , pwbuf, sizeof(pwbuf),
+ ) != 0)
+ pwd = NULL;
}
- if (pw == NULL) {
+ if (pwd == NULL) {
return errno;
}
- system_user = strdup(pw->pw_name);
+ system_user =
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech
Module Name:src Committed By: christos Date: Fri Sep 8 14:57:44 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech: gss_pname_to_uid.c Log Message: This is why we have libroken... To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.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/gssapi/mech/gss_pname_to_uid.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c Fri Sep 8 10:57:44 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gss_pname_to_uid.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: gss_pname_to_uid.c,v 1.3 2017/09/08 14:57:44 christos Exp $ */ /* * Copyright (c) 2011, PADL Software Pty Ltd. @@ -150,12 +150,8 @@ gss_pname_to_uid(OM_uint32 *minor_status OM_uint32 major, tmpMinor; gss_buffer_desc localname = GSS_C_EMPTY_BUFFER; char *szLocalname; -#ifdef POSIX_GETPWNAM_R char pwbuf[2048]; struct passwd pw, *pwd; -#else -struct passwd *pwd; -#endif major = gss_localname(minor_status, pname, mech_type, ); if (GSS_ERROR(major)) @@ -171,12 +167,8 @@ gss_pname_to_uid(OM_uint32 *minor_status memcpy(szLocalname, localname.value, localname.length); szLocalname[localname.length] = '\0'; -#ifdef POSIX_GETPWNAM_R -if (getpwnam_r(szLocalname, , pwbuf, sizeof(pwbuf), ) != 0) +if (rk_getpwnam_r(szLocalname, , pwbuf, sizeof(pwbuf), ) != 0) pwd = NULL; -#else -pwd = getpwnam(szLocalname); -#endif gss_release_buffer(, ); free(szLocalname);
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech
Module Name:src Committed By: christos Date: Fri Sep 8 14:57:44 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech: gss_pname_to_uid.c Log Message: This is why we have libroken... To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.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/krb5
Module Name:src Committed By: christos Date: Fri Sep 8 14:52:50 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: kuserok.c Log Message: always use rk_getpwnam_r... To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.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/krb5
Module Name:src
Committed By: christos
Date: Fri Sep 8 14:52:50 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: kuserok.c
Log Message:
always use rk_getpwnam_r...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.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/krb5/kuserok.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.2 Sat Jan 28 16:31:49 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c Fri Sep 8 10:52:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kuserok.c,v 1.2 2017/01/28 21:31:49 christos Exp $ */
+/* $NetBSD: kuserok.c,v 1.3 2017/09/08 14:52:50 christos Exp $ */
/*
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -625,7 +625,7 @@ kuserok_user_k5login_plug_f(void *plug_c
if (!_krb5_homedir_access(context))
return KRB5_PLUGIN_NO_HANDLE;
- if (getpwnam_r(luser, , pwbuf, sizeof(pwbuf), ) != 0) {
+ if (rk_getpwnam_r(luser, , pwbuf, sizeof(pwbuf), ) != 0) {
krb5_set_error_message(context, errno, "User unknown (getpwnam_r())");
return KRB5_PLUGIN_NO_HANDLE;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 21:52:55 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.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/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 Tue Jul 11 13:45:31 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 17:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.4 2017/07/11 21:52:54 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -708,7 +708,7 @@ _krb5_extract_ticket(krb5_context contex
ret = _krb5_principalname2krb5_principal (context,
_principal,
rep->enc_part.sname,
- rep->enc_part.realm);
+ rep->enc_part.srealm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Tue Jul 11 21:52:55 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c Log Message: fix typo. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.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/krb5
Module Name:src Committed By: christos Date: Tue Jul 11 17:45:32 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c Log Message: https://orpheus-lyre.info/design/index.html https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea In _krb5_extract_ticket() the KDC-REP service name must be obtained from encrypted version stored in 'enc_part' instead of the unencrypted version stored in 'ticket'. Use of the unecrypted version provides an opportunity for successful server impersonation and other attacks. Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams. XXX: pullup 6, 7, 8. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.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/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 17:45:32 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
https://orpheus-lyre.info/design/index.html
https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea
In _krb5_extract_ticket() the KDC-REP service name must be obtained from
encrypted version stored in 'enc_part' instead of the unencrypted version
stored in 'ticket'. Use of the unecrypted version provides an
opportunity for successful server impersonation and other attacks.
Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams.
XXX: pullup 6, 7, 8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.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/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 Sat Jan 28 16:31:49 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 13:45:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.2 2017/01/28 21:31:49 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -707,8 +707,8 @@ _krb5_extract_ticket(krb5_context contex
/* check server referral and save principal */
ret = _krb5_principalname2krb5_principal (context,
_principal,
- rep->kdc_rep.ticket.sname,
- rep->kdc_rep.ticket.realm);
+ rep->enc_part.sname,
+ rep->enc_part.realm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1
Module Name:src Committed By: christos Date: Tue Feb 21 16:07:17 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/lib/libasn1: Makefile Log Message: reproduced also on the regular (not -m32) build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libasn1/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/libasn1/Makefile diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.5 --- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4 Fri Feb 10 23:56:37 2017 +++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Tue Feb 21 11:07:17 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $ +# $NetBSD: Makefile,v 1.5 2017/02/21 16:07:17 christos Exp $ USE_FORT?= yes # network protocol library @@ -81,6 +81,5 @@ SUBDIR= asn1_compile # function orders and since the profile code uses the function # number for label generation, we end up with one of two different # label orders. Disabling ASLR or optimization fixes it. -# This happens only with -m32... COPTS.asn1_krb5_asn1.c+=-O0 .endif
CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1
Module Name:src Committed By: christos Date: Tue Feb 21 16:07:17 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/lib/libasn1: Makefile Log Message: reproduced also on the regular (not -m32) build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libasn1/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/libasn1
Module Name:src
Committed By: christos
Date: Sat Feb 11 04:56:37 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1: Makefile
Log Message:
Add hack for profiling bimodal label generation with -m32 on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/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/libasn1/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 Sat Jan 28 16:31:51 2017
+++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Fri Feb 10 23:56:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:51 christos Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $
USE_FORT?= yes # network protocol library
@@ -68,8 +68,19 @@ ${ASN1COMPILEOBJ}/asn1_compile: try_to_b
SUBDIR= asn1_compile
.endif
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
.if ${USETOOLS} != "yes"
.include
.endif
+
+.if ${MACHINE_ARCH} == "sparc64"
+# Or anything else that uses PROFILE_HOOK with gcc.
+# What happens is that we end up generating one of two different
+# function orders and since the profile code uses the function
+# number for label generation, we end up with one of two different
+# label orders. Disabling ASLR or optimization fixes it.
+# This happens only with -m32...
+COPTS.asn1_krb5_asn1.c+=-O0
+.endif
CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1
Module Name:src Committed By: christos Date: Sat Feb 11 04:56:37 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/lib/libasn1: Makefile Log Message: Add hack for profiling bimodal label generation with -m32 on sparc64 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/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/gssapi/netlogon
Module Name:src Committed By: christos Date: Mon Jan 30 20:27:58 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon: accept_sec_context.c acquire_cred.c add_cred.c canonicalize_name.c compare_name.c display_name.c duplicate_name.c export_name.c init_sec_context.c inquire_cred.c inquire_cred_by_mech.c inquire_mechs_for_name.c Log Message: minimize changes with branch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.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/gssapi/netlogon/accept_sec_context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: accept_sec_context.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: accept_sec_context.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2009 Kungliga Tekniska Högskolan @@ -45,7 +45,7 @@ OM_uint32 _netlogon_accept_sec_context (OM_uint32 * minor_status, gss_ctx_id_t * context_handle, - const gss_cred_id_t acceptor_cred_handle, + gss_const_cred_id_t acceptor_cred_handle, const gss_buffer_t input_token_buffer, const gss_channel_bindings_t input_chan_bindings, gss_name_t * src_name, Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: acquire_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: acquire_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -40,7 +40,7 @@ OM_uint32 _netlogon_acquire_cred(OM_uint32 * min_stat, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 time_req, const gss_OID_set desired_mechs, gss_cred_usage_t cred_usage, @@ -84,7 +84,7 @@ _netlogon_acquire_cred(OM_uint32 * min_s OM_uint32 _netlogon_acquire_cred_ex(gss_status_id_t status, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 flags, OM_uint32 time_req, gss_cred_usage_t cred_usage, Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: add_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: add_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,8 +39,8 @@ OM_uint32 _netlogon_add_cred ( OM_uint32 *minor_status, - const gss_cred_id_t input_cred_handle, - const gss_name_tdesired_name, + gss_const_cred_id_t input_cred_handle, + gss_const_name_tdesired_name, const gss_OID desired_mech,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon
Module Name:src Committed By: christos Date: Mon Jan 30 20:27:58 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon: accept_sec_context.c acquire_cred.c add_cred.c canonicalize_name.c compare_name.c display_name.c duplicate_name.c export_name.c init_sec_context.c inquire_cred.c inquire_cred_by_mech.c inquire_mechs_for_name.c Log Message: minimize changes with branch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.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/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 18:59:04 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: fix deleted line. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ 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/lib/krb5/context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.5 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.6 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.5 Sat Jan 28 16:31:49 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Mon Jan 30 13:59:04 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: context.c,v 1.5 2017/01/28 21:31:49 christos Exp $ */ +/* $NetBSD: context.c,v 1.6 2017/01/30 18:59:04 christos Exp $ */ /* * Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan @@ -506,6 +506,7 @@ copy_etypes (krb5_context context, *ret_enctypes = malloc(sizeof(enctypes[0]) * i); if (*ret_enctypes == NULL) + return krb5_enomem(context); memcpy(*ret_enctypes, enctypes, sizeof(enctypes[0]) * i); return 0; }
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 18:59:04 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: fix deleted line. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ 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/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 00:25:15 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: fix printf args To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.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/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.6 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.7 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.6 Sun Jan 29 13:58:08 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 19:25:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.6 2017/01/29 18:58:08 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.7 2017/01/30 00:25:15 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1248,7 +1248,7 @@ out: _krb5_debug(context, 1, "%s %s done: %d hosts %lu packets %lu:" " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", - realm, ret, __func__, + __func__, realm, ret, ctx->stats.num_hosts, ctx->stats.sent_packets, (intmax_t)stop_time.tv_sec, (long)stop_time.tv_usec,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 00:25:15 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: fix printf args To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.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
Module Name:src
Committed By: christos
Date: Sun Jan 29 22:09:06 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
Log Message:
need libutil for pidfile
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
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/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.4 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.4 Sat Jan 28 16:31:53 2017
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Sun Jan 29 17:09:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2017/01/29 22:09:06 christos Exp $
BINDIR=/usr/libexec
@@ -6,10 +6,10 @@ LDADD+= -lheimntlm -lkrb5 -lhx509 -lheim
LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
LDADD+= -lwind
LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3
+LDADD+= -lsqlite3 -lutil
DPADD+= ${LIBKRB5} ${LIBHX509}
DPADD+= ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBVERS}
DPADD+= ${LIBHEIMBASE} ${LIBHEIMNTLM} ${LIBWIND}
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
+DPADD+= ${LIBSQLITE3} ${LIBUTIL}
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.3 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.4
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.3 Sat Jan 28 16:31:53 2017
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Sun Jan 29 17:09:06 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/01/29 22:09:06 christos Exp $
BINDIR=/usr/sbin
LDADD+= -lkrb5 -lhx509 -lasn1 -lwind
LDADD+= -lcom_err -lroken -lheimbase ${LIBVERS}
LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3
+LDADD+= -lsqlite3 -lutil
DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBWIND}
DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBHEIMBASE} ${LIBVERS}
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
+DPADD+= ${LIBSQLITE3} ${LIBUTIL}
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: christos Date: Sun Jan 29 22:09:06 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/libexec: Makefile.inc src/crypto/external/bsd/heimdal/sbin: Makefile.inc Log Message: need libutil for pidfile To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/libexec/Makefile.inc cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/Makefile.inc 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
Module Name:src Committed By: christos Date: Sun Jan 29 19:38:38 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: this is not needed anymore To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/include/roken.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/roken.h diff -u src/crypto/external/bsd/heimdal/include/roken.h:1.6 src/crypto/external/bsd/heimdal/include/roken.h:1.7 --- src/crypto/external/bsd/heimdal/include/roken.h:1.6 Sun Jan 29 14:38:00 2017 +++ src/crypto/external/bsd/heimdal/include/roken.h Sun Jan 29 14:38:38 2017 @@ -99,7 +99,7 @@ typedef int rk_socket_t; -#include "roken-common.h" +#include ROKEN_CPP_START
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: christos Date: Sun Jan 29 19:38:38 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: this is not needed anymore To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/include/roken.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
Module Name:src Committed By: christos Date: Sun Jan 29 19:38:00 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: include roken-common.h directly. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/include/roken.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
