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/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 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/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 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: Sun Jan 29 18:58:08 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: missing quote To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ 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.5 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.5 Sun Jan 29 13:57:06 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 13:58:08 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.5 2017/01/29 18:57:06 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.6 2017/01/29 18:58:08 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1246,7 +1246,7 @@ out: } _krb5_debug(context, 1, - "%s %s done: %d hosts %lu packets %lu: + "%s %s done: %d hosts %lu packets %lu:" " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", realm, ret, __func__, ctx->stats.num_hosts, ctx->stats.sent_packets,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Sun Jan 29 18:57:06 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: fix printf format To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ 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.4 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.5 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.4 Sat Jan 28 16:31:49 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 13:57:06 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.4 2017/01/28 21:31:49 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.5 2017/01/29 18:57:06 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1246,12 +1246,16 @@ out: } _krb5_debug(context, 1, - "krb5_sendto_context %s done: %d hosts %lu packets %lu wc: %ld.%06ld nr: %ld.%06ld kh: %ld.%06ld tid: %08x", - realm, ret, + "%s %s done: %d hosts %lu packets %lu: + " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", + realm, ret, __func__, ctx->stats.num_hosts, ctx->stats.sent_packets, - stop_time.tv_sec, (long)stop_time.tv_usec, - ctx->stats.name_resolution.tv_sec, (long)ctx->stats.name_resolution.tv_usec, - ctx->stats.krbhst.tv_sec, (long)ctx->stats.krbhst.tv_usec, ctx->stid); + (intmax_t)stop_time.tv_sec, + (long)stop_time.tv_usec, + (intmax_t)ctx->stats.name_resolution.tv_sec, + (long)ctx->stats.name_resolution.tv_usec, + (intmax_t)ctx->stats.krbhst.tv_sec, + (long)ctx->stats.krbhst.tv_usec, ctx->stid); if (freectx)
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: abhinav Date: Fri Jun 10 18:55:52 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_timeofday.3 Log Message: Fix spelling of the month in the date (sent pull request upstream). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3 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/krb5_timeofday.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.1.1.2 Thu Apr 14 14:09:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3 Fri Jun 10 18:55:52 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_timeofday.3,v 1.1.1.2 2011/04/14 14:09:23 elric Exp $ +.\" $NetBSD: krb5_timeofday.3,v 1.2 2016/06/10 18:55:52 abhinav Exp $ .\" .\" Id .\" @@ -35,7 +35,7 @@ .\" .\" Id .\" -.Dd Sepember 16, 2006 +.Dd September 16, 2006 .Dt KRB5_TIMEOFDAY 3 .Os .Sh NAME
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: wiz Date: Thu Apr 28 08:18:05 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5.conf.5 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 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/krb5.conf.5 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.4 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.5 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.4 Thu Apr 24 13:45:34 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Thu Apr 28 08:18:05 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5.conf.5,v 1.4 2014/04/24 13:45:34 pettai Exp $ +.\" $NetBSD: krb5.conf.5,v 1.5 2016/04/28 08:18:05 wiz Exp $ .\" .\" Copyright (c) 1999 - 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -259,7 +259,7 @@ Setting this flag to make it store the MIT way, this is default for Heimdal 0.7. .It Li check-rd-req-server If set to "ignore", the framework will ignore any the server input to -.Xr krb5_rd_req 3, +.Xr krb5_rd_req 3 , this is very useful when the GSS-API server input the wrong server name into the gss_accept_sec_context call. .El
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon May 12 15:20:41 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: CID 745290: check return of fcntl To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ 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.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.1.1.2 Thu Apr 24 08:45:51 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Mon May 12 11:20:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.1.1.2 2014/04/24 12:45:51 pettai Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.2 2014/05/12 15:20:41 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -62,7 +62,8 @@ timed_connect(int s, struct addrinfo *ad if (flags == -1) return -1; -fcntl(s, F_SETFL, flags | O_NONBLOCK); +if (fcntl(s, F_SETFL, flags | O_NONBLOCK)) == -1) + return -1; ret = connect(s, addr-ai_addr, addr-ai_addrlen); if (ret == -1 errno != EINPROGRESS) return -1; @@ -78,7 +79,8 @@ timed_connect(int s, struct addrinfo *ad if (ret != -1 || errno != EINTR) break; } -fcntl(s, F_SETFL, flags); +if (fcntl(s, F_SETFL, flags) == -1) + return -1; if (ret != 1) return -1;
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Mon May 12 15:21:46 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: pac.c
Log Message:
CID 745319: Checking the wrong variable for NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.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/pac.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.1.1.2 Thu Apr 24 08:45:50 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c Mon May 12 11:21:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pac.c,v 1.1.1.2 2014/04/24 12:45:50 pettai Exp $ */
+/* $NetBSD: pac.c,v 1.2 2014/05/12 15:21:46 christos Exp $ */
/*
* Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -756,7 +756,7 @@ build_logon_name(krb5_context context,
s2_len = (ucs2_len + 1) * 2;
s2 = malloc(s2_len);
- if (ucs2 == NULL) {
+ if (s2 == NULL) {
free(ucs2);
return krb5_enomem(context);
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon May 12 18:46:27 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: kill extra ) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ 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.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.2 Mon May 12 11:20:41 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Mon May 12 14:46:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.2 2014/05/12 15:20:41 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.3 2014/05/12 18:46:27 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -62,7 +62,7 @@ timed_connect(int s, struct addrinfo *ad if (flags == -1) return -1; -if (fcntl(s, F_SETFL, flags | O_NONBLOCK)) == -1) +if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1) return -1; ret = connect(s, addr-ai_addr, addr-ai_addrlen); if (ret == -1 errno != EINPROGRESS)
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Thu Nov 14 05:04:24 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c
Log Message:
CID 240779: Wrong sizeof used in allocation
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
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.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.2 Thu Apr 14 14:02:07 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Thu Nov 14 00:04:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: context.c,v 1.2 2011/04/14 18:02:07 elric Exp $ */
+/* $NetBSD: context.c,v 1.3 2013/11/14 05:04:24 christos Exp $ */
/*
* Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan
@@ -433,13 +433,13 @@ copy_etypes (krb5_context context,
;
i++;
-*ret_enctypes = malloc(sizeof(ret_enctypes[0]) * i);
+*ret_enctypes = malloc(sizeof(**ret_enctypes) * i);
if (*ret_enctypes == NULL) {
krb5_set_error_message(context, ENOMEM,
N_(malloc: out of memory, ));
return ENOMEM;
}
-memcpy(*ret_enctypes, enctypes, sizeof(ret_enctypes[0]) * i);
+memcpy(*ret_enctypes, enctypes, sizeof(**ret_enctypes) * i);
return 0;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: njoly Date: Mon Jun 4 14:24:03 UTC 2012 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5.conf.5 Log Message: Small spacing fix. Unbreaks section in xref. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 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/krb5.conf.5 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.2 Thu Apr 28 14:38:49 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Mon Jun 4 14:24:03 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: krb5.conf.5,v 1.2 2011/04/28 14:38:49 wiz Exp $ +.\ $NetBSD: krb5.conf.5,v 1.3 2012/06/04 14:24:03 njoly Exp $ .\ .\ Copyright (c) 1999 - 2005 Kungliga Tekniska Högskolan .\ (Royal Institute of Technology, Stockholm, Sweden). @@ -252,7 +252,7 @@ Setting this flag to make it store the MIT way, this is default for Heimdal 0.7. .It Li check-rd-req-server If set to ignore, the framework will ignore any the server input to -.Xr krb5_rd_req 3, +.Xr krb5_rd_req 3 , this is very useful when the GSS-API server input the wrong server name into the gss_accept_sec_context call. .El
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: elric Date: Thu Apr 14 18:00:30 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: auth_context.c salt.c Log Message: Copy coverity alloc comments from old location. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c \ src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.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/auth_context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c:1.1.1.1 Wed Apr 13 18:15:31 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/auth_context.c Thu Apr 14 18:00:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: auth_context.c,v 1.1.1.1 2011/04/13 18:15:31 elric Exp $ */ +/* $NetBSD: auth_context.c,v 1.2 2011/04/14 18:00:30 elric Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -264,6 +264,7 @@ return 0; } +/* coverity[+alloc : arg-*2] */ static krb5_error_code copy_key(krb5_context context, krb5_keyblock *in, @@ -291,6 +292,7 @@ return copy_key(context, auth_context-local_subkey, keyblock); } +/* coverity[+alloc : arg-*2] */ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL krb5_auth_con_getremotesubkey(krb5_context context, krb5_auth_context auth_context, Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c:1.1.1.1 Wed Apr 13 18:15:37 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/salt.c Thu Apr 14 18:00:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: salt.c,v 1.1.1.1 2011/04/13 18:15:37 elric Exp $ */ +/* $NetBSD: salt.c,v 1.2 2011/04/14 18:00:30 elric Exp $ */ /* * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan @@ -35,6 +35,7 @@ #include krb5_locl.h +/* coverity[+alloc : arg-*3] */ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL krb5_salttype_to_string (krb5_context context, krb5_enctype etype,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: elric Date: Thu Apr 14 18:02:08 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: Turn on the hack which disables Kerberos if there is no /etc/krb5.conf. We should review this logic and come up with a better way to do this as now that there are DNS SRV RRs for locating KDCs, the lack of a config does not imply that Kerberos should be turned off. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ 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.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.1.1.1 Wed Apr 13 18:15:32 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Thu Apr 14 18:02:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: context.c,v 1.1.1.1 2011/04/13 18:15:32 elric Exp $ */ +/* $NetBSD: context.c,v 1.2 2011/04/14 18:02:07 elric Exp $ */ /* * Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan @@ -612,7 +612,7 @@ } filenames++; } -#if 0 +#if 1 /* with this enabled and if there are no config files, Kerberos is considererd disabled */ if(tmp == NULL)
