CVS commit: [netbsd-6] src/crypto/external/bsd/heimdal

2017-09-10 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Mon Sep 11 04:43:23 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist [netbsd-6]: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm [netbsd-6]: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech [netbsd-6]:
gss_pname_to_uid.c
src/crypto/external/bsd/heimdal/dist/lib/hx509 [netbsd-6]: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-6]: config_file.c
get_default_principal.c kuserok.c
src/crypto/external/bsd/heimdal/dist/lib/roken [netbsd-6]: getxxyyy.c
roken.h.in
src/crypto/external/bsd/heimdal/include [netbsd-6]: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf [netbsd-6]:
check-getpwuid_r-posix.m4

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1503):
crypto/external/bsd/heimdal/include/config.h: revision 1.9
crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c: revision 1.3
crypto/external/bsd/heimdal/dist/configure.ac: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/config.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c: revision 1.3
crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4: revision 
1.1
crypto/external/bsd/heimdal/include/roken.h: revision 1.8
crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c: 
revision 1.3
crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c: revision 1.3
crypto/external/bsd/heimdal/dist/kcm/client.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in: revision 1.5
always use rk_getpwnam_r...
--
This is why we have libroken...
--
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...)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2.12.2 -r1.2.12.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.1.1.1.6.1 -r1.1.1.1.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
cvs rdiff -u -r1.2.22.2 -r1.2.22.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 \
src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 \
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.1.1.1.6.1 src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.6.2
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.1.1.1.6.1	Wed Aug 30 07:10:48 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac	Mon Sep 11 04:43:22 2017
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.1.1.1.6.1 $)
+AC_REVISION($Revision: 1.1.1.1.6.2 $)
 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.1.1.1.6.1 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.6.2
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.1.1.1.6.1	Wed Aug 30 07:10:50 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c	Mon Sep 11 04:43:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: client.c,v 1.1.1.1.6.1 2017/08/30 07:10:50 snj Exp $	*/
+/*	$NetBSD: client.c,v 1.1.1.1.6.2 2017/09/11 04:43:22 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8

CVS commit: [netbsd-6] src/crypto/external/bsd/heimdal/dist/lib/krb5

2017-07-13 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Jul 13 09:01:29 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5 [netbsd-6]: ticket.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1461):
crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c: revision 1.3
crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c: revision 1.4
https://orpheus-lyre.info/design/index.html;>https://orpheus-lyre.info/design/index.html
https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea;>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.
fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \
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.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.1.1.1.6.1
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.1.1.1	Wed Apr 13 18:15:39 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c	Thu Jul 13 09:01:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ticket.c,v 1.1.1.1 2011/04/13 18:15:39 elric Exp $	*/
+/*	$NetBSD: ticket.c,v 1.1.1.1.6.1 2017/07/13 09:01:29 martin Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -715,8 +715,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.srealm);
 if (ret)
 	goto out;
 if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){

CVS commit: [netbsd-6] src/crypto/external/bsd/heimdal/bin/krb5-config

2013-05-19 Thread Jeff Rizzo 
Module Name:src
Committed By:   riz
Date:   Sun May 19 22:18:06 UTC 2013

Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config [netbsd-6]: Makefile

Log Message:
Pull up following revision(s) (requested by joerg in ticket #871):
crypto/external/bsd/heimdal/bin/krb5-config/Makefile: revision 1.2
Don't force pthread linkage.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.6.1 \
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.1 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1.6.1
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1	Wed Apr 13 19:16:46 2011
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile	Sun May 19 22:18:06 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2011/04/13 19:16:46 elric Exp $
+#	$NetBSD: Makefile,v 1.1.6.1 2013/05/19 22:18:06 riz Exp $
 
 .include bsd.own.mk
 .include ${.CURDIR}/../../Makefile.inc
@@ -24,7 +24,7 @@ krb5-config: krb5-config.in
 	-e s!@LIB_dlopen\@!!g \
 	-e s!@LIB_door_create\@!!g \
 	-e s!@LIB_pkinit\@!-lhx509!g \
-	-e s!@PTHREAD_LIBADD\@!-lpthread!g \
+	-e s!@PTHREAD_LIBADD\@!!g \
 	-e s!@LIBS\@!!g \
 	${HEIMDIST}/tools/krb5-config.in  $@
 	chmod +x $@