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

[Christos Zoulas]

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/krb5

[Kamil Rytarowski]

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

[S.P.Zeidler]

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

[Christos Zoulas]

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

[Christos Zoulas]

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

[Christos Zoulas]

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

[Christos Zoulas]

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/lib/gssapi/mech

[Christos Zoulas]

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/krb5

[Christos Zoulas]

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

[Christos Zoulas]

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

[Christos Zoulas]

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/gssapi/netlogon

[Christos Zoulas]

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/krb5

[Christos Zoulas]

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

[Christos Zoulas]

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 29 19:23:28 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen_locl.h main.c
src/crypto/external/bsd/heimdal/dist/lib/roken: getarg.c

Log Message:
prefer some local include files for tools build


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h \
src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.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/asn1/gen_locl.h
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.2 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.2	Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h	Sun Jan 29 14:23:28 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gen_locl.h,v 1.2 2017/01/28 21:31:45 christos Exp $	*/
+/*	$NetBSD: gen_locl.h,v 1.3 2017/01/29 19:23:28 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -52,8 +52,8 @@
 #include 
 #include "hash.h"
 #include "symbol.h"
-#include 
-#include 
+#include "asn1-common.h"
+#include "der.h"
 #include "der-private.h"
 
 void generate_type (const Symbol *);
Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.2	Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c	Sun Jan 29 14:23:28 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.2 2017/01/28 21:31:45 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.3 2017/01/29 19:23:28 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -34,7 +34,7 @@
  */
 
 #include "gen_locl.h"
-#include 
+#include "getarg.h"
 #include "lex.h"
 
 extern FILE *yyin;

Index: src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.5
--- src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.4	Sat Jan 28 16:31:50 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c	Sun Jan 29 14:23:28 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: getarg.c,v 1.4 2017/01/28 21:31:50 christos Exp $	*/
+/*	$NetBSD: getarg.c,v 1.5 2017/01/29 19:23:28 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
 

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

[Christos Zoulas]

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

[Christos Zoulas]

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/asn1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Jan 29 01:46:37 UTC 2017

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c

Log Message:
handle our basename.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.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/asn1/gen.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.5
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4	Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c	Sat Jan 28 20:46:37 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $	*/
+/*	$NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -38,7 +38,7 @@
 #include "gen_locl.h"
 #include 
 
-__RCSID("$NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $");
+__RCSID("$NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $");
 
 FILE *privheaderfile, *headerfile, *codefile, *logfile, *templatefile;
 
@@ -153,10 +153,12 @@ init_generate (const char *filename, con
 /* template file */
 if (asprintf(, "%s-template.x", headerbase) < 0 || template == NULL)
 	errx(1, "malloc");
+char *copy = estrdup(filename);
+char *bn = basename(copy);
 fprintf (headerfile,
 	 "/* Generated from %s */\n"
 	 "/* Do not edit */\n\n",
-	 basename(filename));
+	 bn);
 fprintf (headerfile,
 	 "#ifndef __%s_h__\n"
 	 "#define __%s_h__\n\n", headerbase, headerbase);
@@ -273,8 +275,9 @@ init_generate (const char *filename, con
 	 "#include \n"
 	 "#include \n"
 	 "#include \n",
-	 basename(filename),
+	 bn,
 	 type_file_string);
+free(copy);
 
 fprintf (templatefile,
 	 "#include <%s>\n"
@@ -364,6 +367,8 @@ generate_header_of_codefile(const char *
 fprintf(logfile, "%s ", filename);
 free(filename);
 filename = NULL;
+char *copy = estrdup(orig_filename);
+char *bn = basename(copy);
 fprintf (codefile,
 	 "/* Generated from %s */\n"
 	 "/* Do not edit */\n\n"
@@ -375,8 +380,9 @@ generate_header_of_codefile(const char *
 	 "#include \n"
 	 "#include \n"
 	 "#include \n",
-	 basename(orig_filename),
+	 bn,
 	 type_file_string);
+free(copy);
 
 fprintf (codefile,
 	 "#include \"%s\"\n"

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Oct  9 15:01:49 UTC 2016

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c

Log Message:
PR/51543: Henning Petersen: replace , with ;


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.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/kerberos5.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.6
--- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5	Thu Apr 24 09:45:34 2014
+++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c	Sun Oct  9 11:01:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kerberos5.c,v 1.5 2014/04/24 13:45:34 pettai Exp $	*/
+/*	$NetBSD: kerberos5.c,v 1.6 2016/10/09 15:01:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
@@ -1455,7 +1455,7 @@ _kdc_as_rep(krb5_context context,
 
 	e_data.data   = buf;
 	e_data.length = len;
-	e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ",
+	e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ";
 
 	ret = KRB5KDC_ERR_PREAUTH_REQUIRED;
 

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

[Abhinav Upadhyay]

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

[Thomas Klausner]

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/hdb

[Fredrik Pettai]

Module Name:src
Committed By:   pettai
Date:   Wed Nov 26 10:12:27 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hdb: keys.c

Log Message:
fix comma error


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.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/hdb/keys.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2	Wed Nov 26 07:39:52 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c	Wed Nov 26 10:12:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: keys.c,v 1.2 2014/11/26 07:39:52 pettai Exp $	*/
+/*	$NetBSD: keys.c,v 1.3 2014/11/26 10:12:27 pettai Exp $	*/
 
 
 /*
@@ -77,8 +77,8 @@ static const krb5_enctype des_etypes[] =
 
 static const krb5_enctype all_etypes[] = {
 ETYPE_AES256_CTS_HMAC_SHA1_96,
-ETYPE_DES3_CBC_SHA1
-ETYPE_ARCFOUR_HMAC_MD5,
+ETYPE_DES3_CBC_SHA1,
+ETYPE_ARCFOUR_HMAC_MD5
 };
 
 static krb5_error_code

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

[Fredrik Pettai]

Module Name:src
Committed By:   pettai
Date:   Wed Nov 26 07:39:52 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hdb: keys.c

Log Message:
In all_etypes prefer des3-cbc-sha1 over arcfour-hmac-md5 (#24c8bac)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.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/hdb/keys.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.1.1.2	Thu Apr 24 12:45:28 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c	Wed Nov 26 07:39:52 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: keys.c,v 1.1.1.2 2014/04/24 12:45:28 pettai Exp $	*/
+/*	$NetBSD: keys.c,v 1.2 2014/11/26 07:39:52 pettai Exp $	*/
 
 
 /*
@@ -77,8 +77,8 @@ static const krb5_enctype des_etypes[] =
 
 static const krb5_enctype all_etypes[] = {
 ETYPE_AES256_CTS_HMAC_SHA1_96,
-ETYPE_ARCFOUR_HMAC_MD5,
 ETYPE_DES3_CBC_SHA1
+ETYPE_ARCFOUR_HMAC_MD5,
 };
 
 static krb5_error_code

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Thu Jul 24 22:54:10 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: cache.c

Log Message:
Fix size argument of memcmp.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 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.1.1.2 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.1.1.2	Thu Apr 24 12:45:27 2014
+++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c	Thu Jul 24 22:54:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $	*/
+/*	$NetBSD: cache.c,v 1.2 2014/07/24 22:54:10 joerg Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -104,7 +104,7 @@ kcm_ccache_resolve_by_uuid(krb5_context 
 for (p = ccache_head; p != NULL; p = p-next) {
 	if ((p-flags  KCM_FLAGS_VALID) == 0)
 	continue;
-	if (memcmp(p-uuid, uuid, sizeof(uuid)) == 0) {
+	if (memcmp(p-uuid, uuid, sizeof(*uuid)) == 0) {
 	ret = 0;
 	break;
 	}

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

[Christos Zoulas]

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

[Christos Zoulas]

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/gssapi/krb5

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 12 15:25:49 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: verify_mic.c

Log Message:
CID 745439: Fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.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/krb5/verify_mic.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2	Thu Apr 24 08:45:29 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c	Mon May 12 11:25:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: verify_mic.c,v 1.1.1.2 2014/04/24 12:45:29 pettai Exp $	*/
+/*	$NetBSD: verify_mic.c,v 1.2 2014/05/12 15:25:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan
@@ -256,7 +256,8 @@ retry:
   krb5_crypto_destroy (context, crypto);
   ret = krb5_crypto_init(context, key,
 			 ETYPE_DES3_CBC_SHA1, crypto);
-  if (ret){
+  if (ret) {
+  free (tmp);
   *minor_status = ret;
   return GSS_S_FAILURE;
   }

CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 12 15:27:36 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm: creds.c

Log Message:
CID 745411: Fix memory leak


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.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/ntlm/creds.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.1.1.2	Thu Apr 24 08:45:29 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c	Mon May 12 11:27:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: creds.c,v 1.1.1.2 2014/04/24 12:45:29 pettai Exp $	*/
+/*	$NetBSD: creds.c,v 1.2 2014/05/12 15:27:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -62,8 +62,11 @@ _gss_ntlm_inquire_cred
 	n-domain = strdup(c-domain);
 	}
 	if (n == NULL || n-user == NULL || n-domain == NULL) {
-	if (n)
+	if (n) {
 		free(n-user);
+		free(n-domain);
+		free(n);
+	}
 	*minor_status = ENOMEM;
 	return GSS_S_FAILURE;
 	}

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon May 12 15:34:23 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: rpc.c

Log Message:
CID 1011266: Unchecked returns


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/rpc.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/kadmin/rpc.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2	Thu Apr 24 08:45:27 2014
+++ src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c	Mon May 12 11:34:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $	*/
+/*	$NetBSD: rpc.c,v 1.2 2014/05/12 15:34:23 christos Exp $	*/
 
 /*
  * Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -465,7 +465,7 @@ ret_principal_ent(krb5_context contextp,
 ent-max_life = flag;
 CHECK(krb5_ret_uint32(sp, flag));
 if (flag == 0)
-	ret_principal_xdr(contextp, sp, ent-mod_name);
+	CHECK(ret_principal_xdr(contextp, sp, ent-mod_name));
 CHECK(krb5_ret_uint32(sp, flag));
 ent-mod_date = flag;
 CHECK(krb5_ret_uint32(sp, flag));

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

[Christos Zoulas]

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/roken

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Apr  6 14:36:35 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/roken: resolve.c

Log Message:
PR/48718: Juergen Hannken-Illjes: Heimdal leaks file descriptors
Add missing call to free the resolve handle on success.
XXX: pullup 6


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.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/roken/resolve.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1	Wed Apr 13 14:15:42 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c	Sun Apr  6 10:36:35 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: resolve.c,v 1.1.1.1 2011/04/13 18:15:42 elric Exp $	*/
+/*	$NetBSD: resolve.c,v 1.2 2014/04/06 14:36:35 christos Exp $	*/
 
 /*
  * Copyright (c) 1995 - 2006 Kungliga Tekniska Högskolan
@@ -590,6 +590,7 @@ dns_lookup_int(const char *domain, int r
 
 len = min(len, size);
 r = parse_reply(reply, len);
+resolve_free_handle(handle);
 free(reply);
 return r;
 }

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

[Alan Barrett]

Module Name:src
Committed By:   apb
Date:   Thu Mar 27 16:10:46 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: engine.c md2.c
src/crypto/external/bsd/heimdal/dist/lib/kadm5: ad.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: test_pknistkdf.c

Log Message:
Fix sizeof errors in memset calls in heimdal.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.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/hcrypto/engine.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1	Wed Apr 13 18:14:49 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c	Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: engine.c,v 1.1.1.1 2011/04/13 18:14:49 elric Exp $	*/
+/*	$NetBSD: engine.c,v 1.2 2014/03/27 16:10:45 apb Exp $	*/
 
 /*
  * Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -90,7 +90,7 @@ ENGINE_finish(ENGINE *engine)
 if(engine-destroy)
 	(*engine-destroy)(engine);
 
-memset(engine, 0, sizeof(engine));
+memset(engine, 0, sizeof(*engine));
 engine-references = -1;
 
 
Index: src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1	Wed Apr 13 18:14:50 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c	Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: md2.c,v 1.1.1.1 2011/04/13 18:14:50 elric Exp $	*/
+/*	$NetBSD: md2.c,v 1.2 2014/03/27 16:10:45 apb Exp $	*/
 
 /*
  * Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -132,5 +132,5 @@ MD2_Final (void *res, struct md2 *m)
 MD2_Update(m, pad, 16);
 
 memcpy(res, m-state, MD2_DIGEST_LENGTH);
-memset(m, 0, sizeof(m));
+memset(m, 0, sizeof(*m));
 }

Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1	Wed Apr 13 18:15:29 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c	Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $	*/
+/*	$NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $	*/
 
 /*
  * Copyright (c) 2004 Kungliga Tekniska Högskolan
@@ -49,7 +49,7 @@
 #include krb5/base64.h
 #endif
 
-__RCSID($NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $);
+__RCSID($NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $);
 
 #ifdef OPENLDAP
 
@@ -1289,7 +1289,7 @@ kadm5_ad_randkey_principal(void *server_
  password,
  principal,
  (*keys)[0]);
-	memset(password, 0, sizeof(password));
+	memset(password, 0, plen);
 	if (ret) {
 	free(*keys);
 	*keys = NULL;

Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1	Wed Apr 13 18:15:38 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c	Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: test_pknistkdf.c,v 1.1.1.1 2011/04/13 18:15:38 elric Exp $	*/
+/*	$NetBSD: test_pknistkdf.c,v 1.2 2014/03/27 16:10:46 apb Exp $	*/
 
 /*
  * Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -143,7 +143,7 @@ test_dh2key(krb5_context context, int i,
 AlgorithmIdentifier ai;
 size_t size;
 
-memset(ticket, 0, sizeof(ticket));
+memset(ticket, 0, sizeof(ticket));
 
 ai.algorithm = *c-oid;
 ai.parameters = NULL;

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

[Alan Barrett]

Module Name:src
Committed By:   apb
Date:   Sat Jan 18 09:20:36 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c
src/crypto/external/bsd/heimdal/dist/lib/com_err: compile_et.c

Log Message:
Use basename(filename) in Generated from %s comments in output files,
to avoid embedding the path to the build tree.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.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/asn1/gen.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.1.1.1	Wed Apr 13 18:14:40 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c	Sat Jan 18 09:20:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: gen.c,v 1.1.1.1 2011/04/13 18:14:40 elric Exp $	*/
+/*	$NetBSD: gen.c,v 1.2 2014/01/18 09:20:36 apb Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -36,8 +36,9 @@
  */
 
 #include gen_locl.h
+#include libgen.h
 
-__RCSID($NetBSD: gen.c,v 1.1.1.1 2011/04/13 18:14:40 elric Exp $);
+__RCSID($NetBSD: gen.c,v 1.2 2014/01/18 09:20:36 apb Exp $);
 
 FILE *privheaderfile, *headerfile, *codefile, *logfile, *templatefile;
 
@@ -155,7 +156,7 @@ init_generate (const char *filename, con
 fprintf (headerfile,
 	 /* Generated from %s */\n
 	 /* Do not edit */\n\n,
-	 filename);
+	 basename(filename));
 fprintf (headerfile,
 	 #ifndef __%s_h__\n
 	 #define __%s_h__\n\n, headerbase, headerbase);
@@ -268,7 +269,7 @@ init_generate (const char *filename, con
 	 #include errno.h\n
 	 #include limits.h\n
 	 #include krb5/krb5-types.h\n,
-	 filename);
+	 basename(filename));
 
 fprintf (templatefile,
 	 #include %s\n
@@ -366,7 +367,7 @@ generate_header_of_codefile(const char *
 	 #include errno.h\n
 	 #include limits.h\n
 	 #include krb5/krb5-types.h\n,
-	 orig_filename);
+	 basename(orig_filename));
 
 fprintf (codefile,
 	 #include %s\n

Index: src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.1.1.1	Wed Apr 13 18:14:43 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c	Sat Jan 18 09:20:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: compile_et.c,v 1.1.1.1 2011/04/13 18:14:43 elric Exp $	*/
+/*	$NetBSD: compile_et.c,v 1.2 2014/01/18 09:20:36 apb Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Kungliga Tekniska Högskolan
@@ -39,6 +39,7 @@
 
 #include compile_et.h
 #include getarg.h
+#include libgen.h
 
 #include roken.h
 #include err.h
@@ -77,7 +78,7 @@ generate_c(void)
 if(c_file == NULL)
 	return 1;
 
-fprintf(c_file, /* Generated from %s */\n, filename);
+fprintf(c_file, /* Generated from %s */\n, basename(filename));
 if(id_str)
 	fprintf(c_file, /* %s */\n, id_str);
 fprintf(c_file, \n);
@@ -142,7 +143,7 @@ generate_h(void)
 	if(!isalnum((unsigned char)*p))
 	*p = '_';
 
-fprintf(h_file, /* Generated from %s */\n, filename);
+fprintf(h_file, /* Generated from %s */\n, basename(filename));
 if(id_str)
 	fprintf(h_file, /* %s */\n, id_str);
 fprintf(h_file, \n);

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

[Christos Zoulas]

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/com_err

[Julian Fagir]

Module Name:src
Committed By:   jdf
Date:   Wed Jul  4 20:46:14 UTC 2012

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3

Log Message:
Change little wording error (s/associate/associated/) and formatting error.
Patch proposal was sent upstream to Heimdal as well.
Patch by jklowden in PR lib/46651.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.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/com_err/com_err.3
diff -u src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2	Thu Apr 14 14:08:23 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3	Wed Jul  4 20:46:14 2012
@@ -1,4 +1,4 @@
-.\	$NetBSD: com_err.3,v 1.1.1.2 2011/04/14 14:08:23 elric Exp $
+.\	$NetBSD: com_err.3,v 1.2 2012/07/04 20:46:14 jdf Exp $
 .\
 .\ Copyright (c) 2005 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden).
@@ -136,10 +136,11 @@ This routine provides an interface, equi
 which may be used by higher-level variadic functions (functions which
 accept variable numbers of arguments).
 .It Fn error_message code
-Returns the character string error message associate with
+Returns the character string error message associated with
 .Fa code .
 If
-.Fa code is associated with an unknown error table, or if
+.Fa code
+is associated with an unknown error table, or if
 .Fa code
 is associated with a known error table but is not in the table, a
 string of the form `Unknown code  NN' is returned, where  is

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

[Nicolas Joly]

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/kdc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Aug 15 21:00:50 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c

Log Message:
use intmax_t to print times.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.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/kerberos5.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.1.1.1	Wed Apr 13 14:14:37 2011
+++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c	Mon Aug 15 17:00:49 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kerberos5.c,v 1.1.1.1 2011/04/13 18:14:37 elric Exp $	*/
+/*	$NetBSD: kerberos5.c,v 1.2 2011/08/15 21:00:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
@@ -1265,9 +1265,9 @@
  		ret = KRB5KRB_AP_ERR_SKEW;
  		kdc_log(context, config, 0,
 			Too large time skew, 
-			client time %s is out by %u  %u seconds -- %s,
-			client_time,
-			(unsigned)abs(kdc_time - p.patimestamp),
+			client time %s is out by %jd  %jd seconds -- %s,
+			(intmax_t)client_time,
+			imaxabs(kdc_time - p.patimestamp),
 			context-max_skew,
 			client_name);
 

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Tue Aug 16 01:14:58 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c

Log Message:
We shouldn't cast client_time to (intmax_t) because it is a char * not
an integer.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.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/kerberos5.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2	Mon Aug 15 21:00:49 2011
+++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c	Tue Aug 16 01:14:57 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kerberos5.c,v 1.2 2011/08/15 21:00:49 christos Exp $	*/
+/*	$NetBSD: kerberos5.c,v 1.3 2011/08/16 01:14:57 elric Exp $	*/
 
 /*
  * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
@@ -1266,7 +1266,7 @@
  		kdc_log(context, config, 0,
 			Too large time skew, 
 			client time %s is out by %jd  %jd seconds -- %s,
-			(intmax_t)client_time,
+			client_time,
 			imaxabs(kdc_time - p.patimestamp),
 			context-max_skew,
 			client_name);

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Aug 16 02:59:00 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c

Log Message:
add extra cast for systems where sizeof(time_t)  sizeof(intmax_t)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.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/kerberos5.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.4
--- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3	Mon Aug 15 21:14:57 2011
+++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c	Mon Aug 15 22:59:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kerberos5.c,v 1.3 2011/08/16 01:14:57 elric Exp $	*/
+/*	$NetBSD: kerberos5.c,v 1.4 2011/08/16 02:59:00 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
@@ -1268,7 +1268,7 @@
 			client time %s is out by %jd  %jd seconds -- %s,
 			client_time,
 			imaxabs(kdc_time - p.patimestamp),
-			context-max_skew,
+			(intmax_t)context-max_skew,
 			client_name);
 
 		/*

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

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Fri Jul  1 02:10:20 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: cert.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-des3.c

Log Message:
Fix memset usage.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.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/hx509/cert.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1	Wed Apr 13 18:15:10 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c	Fri Jul  1 02:10:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cert.c,v 1.1.1.1 2011/04/13 18:15:10 elric Exp $	*/
+/*	$NetBSD: cert.c,v 1.2 2011/07/01 02:10:19 joerg Exp $	*/
 
 /*
  * Copyright (c) 2004 - 2007 Kungliga Tekniska Högskolan
@@ -357,7 +357,7 @@
 free(cert-friendlyname);
 if (cert-basename)
 	hx509_name_free(cert-basename);
-memset(cert, 0, sizeof(cert));
+memset(cert, 0, sizeof(*cert));
 free(cert);
 }
 

Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1	Wed Apr 13 18:15:32 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c	Fri Jul  1 02:10:19 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: crypto-des3.c,v 1.1.1.1 2011/04/13 18:15:32 elric Exp $	*/
+/*	$NetBSD: crypto-des3.c,v 1.2 2011/07/01 02:10:19 joerg Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -204,7 +204,7 @@
 DES_cblock *k;
 int i, j;
 
-memset(x, 0, sizeof(x));
+memset(x, 0, 32);
 for (i = 0; i  3; ++i) {
 	unsigned char foo;
 	for (j = 0; j  7; ++j) {

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

[Matthias Drochner]

Module Name:src
Committed By:   drochner
Date:   Thu May  5 18:40:25 UTC 2011

Removed Files:
src/crypto/external/bsd/heimdal/dist/po/heim_com_err-1765328384:
sv_SE.mo
src/crypto/external/bsd/heimdal/dist/po/heimdal_krb5: sv_SE.mo
src/crypto/external/bsd/heimdal/dist/po/heimdal_kuser: sv_SE.mo

Log Message:
remove generated binary files


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/heimdal/dist/po/heim_com_err-1765328384/sv_SE.mo
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/heimdal/dist/po/heimdal_krb5/sv_SE.mo
cvs rdiff -u -r1.1.1.1 -r0 \
src/crypto/external/bsd/heimdal/dist/po/heimdal_kuser/sv_SE.mo

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

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:07:13 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: kcm.8
src/crypto/external/bsd/heimdal/dist/kuser: kimpersonate.8
src/crypto/external/bsd/heimdal/dist/lib/kadm5: iprop-log.8 iprop.8

Log Message:
Heimdal is not an OS.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/kcm.8
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8

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/kcm.8
diff -u src/crypto/external/bsd/heimdal/dist/kcm/kcm.8:1.2 src/crypto/external/bsd/heimdal/dist/kcm/kcm.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/kcm.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kcm/kcm.8	Thu Apr 28 14:07:12 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: kcm.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\	$NetBSD: kcm.8,v 1.3 2011/04/28 14:07:12 wiz Exp $
 .\
 .\ Copyright (c) 2005 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -35,7 +35,7 @@
 .\
 .Dd May 29, 2005
 .Dt KCM 8
-.Os Heimdal
+.Os
 .Sh NAME
 .Nm kcm
 .Nd

Index: src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8
diff -u src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8:1.2 src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8	Thu Apr 28 14:07:12 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: kimpersonate.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\	$NetBSD: kimpersonate.8,v 1.3 2011/04/28 14:07:12 wiz Exp $
 .\
 .\ Copyright (c) 2002 - 2007 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -35,7 +35,7 @@
 .\
 .Dd September 18, 2006
 .Dt KIMPERSONATE 8
-.Os Heimdal
+.Os
 .Sh NAME
 .Nm kimpersonate
 .Nd

Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8
diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.2 src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.2	Thu Apr 14 19:19:20 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8	Thu Apr 28 14:07:12 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: iprop-log.8,v 1.2 2011/04/14 19:19:20 elric Exp $
+.\	$NetBSD: iprop-log.8,v 1.3 2011/04/28 14:07:12 wiz Exp $
 .\
 .\ Id
 .\ 
@@ -37,7 +37,7 @@
 .\
 .Dd February 18, 2007
 .Dt IPROP-LOG 8
-.Os Heimdal
+.Os
 .Sh NAME
 .Nm iprop-log
 .Nd
Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8
diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8:1.2 src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8:1.2	Thu Apr 14 19:19:20 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8	Thu Apr 28 14:07:13 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: iprop.8,v 1.2 2011/04/14 19:19:20 elric Exp $
+.\	$NetBSD: iprop.8,v 1.3 2011/04/28 14:07:13 wiz Exp $
 .\
 .\ Id
 .\ 
@@ -35,7 +35,7 @@
 .\
 .Dd May 24, 2005
 .Dt IPROP 8
-.Os Heimdal
+.Os
 .Sh NAME
 .Nm iprop ,
 .Nm ipropd-master ,

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

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:15:53 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: kadmind.8

Log Message:
Punctuation fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8

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/kadmin/kadmind.8
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2 src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8	Thu Apr 28 14:15:53 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: kadmind.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\	$NetBSD: kadmind.8,v 1.3 2011/04/28 14:15:53 wiz Exp $
 .\
 .\ Copyright (c) 2002 - 2004 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -78,8 +78,7 @@
 .Xr kpasswdd 8
 daemon is responsible for the Kerberos 5 password changing protocol
 (used by
-.Xr kpasswd 1 )
-.
+.Xr kpasswd 1 ) .
 .Pp
 This daemon should only be run on the master server, and not on any
 slaves.

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

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:16:40 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: kdc.8

Log Message:
Fix typo.


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

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/kdc.8
diff -u src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.2 src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kdc/kdc.8	Thu Apr 28 14:16:40 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: kdc.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\	$NetBSD: kdc.8,v 1.3 2011/04/28 14:16:40 wiz Exp $
 .\
 .\ Copyright (c) 2003 - 2004 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -112,7 +112,7 @@
 specified.
 The default is whatever is returned by
 .Fn krb_get_lrealm .
-This option is only availabe if the KDC has been compiled with version
+This option is only available if the KDC has been compiled with version
 4 support.
 .It Fl K , Fl -kaserver
 Enable kaserver emulation (in case it's compiled in).

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

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:18:08 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: hprop.8

Log Message:
Punctuation fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8

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/hprop.8
diff -u src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.2 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kdc/hprop.8	Thu Apr 28 14:18:08 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: hprop.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\	$NetBSD: hprop.8,v 1.3 2011/04/28 14:18:08 wiz Exp $
 .\
 .\ Copyright (c) 2000 - 2004 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -124,7 +124,7 @@
 .Sh EXAMPLES
 The following will propagate a database to another machine (which
 should run
-.Xr hpropd 8 ):
+.Xr hpropd 8 ) :
 .Bd -literal -offset indent
 $ hprop slave-1 slave-2
 .Ed

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

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:21:52 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1

Log Message:
Fix typo.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1

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/copy_cred_cache.1
diff -u src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.2
--- src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.1.1.2	Thu Apr 14 14:08:18 2011
+++ src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1	Thu Apr 28 14:21:52 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: copy_cred_cache.1,v 1.1.1.2 2011/04/14 14:08:18 elric Exp $
+.\	$NetBSD: copy_cred_cache.1,v 1.2 2011/04/28 14:21:52 wiz Exp $
 .\
 .\ Copyright (c) 2004 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden).
@@ -90,7 +90,7 @@
 .Sh DIAGNOSTICS
 The
 .Nm
-utility exits 0 on success, and \*[Gt]0 if an error occurs, or of no
+utility exits 0 on success, and \*[Gt]0 if an error occurs, or if no
 credentials where actually copied.
 .\.Sh SEE ALSO
 .\.Sh STANDARDS

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 21 17:56:24 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: util.c

Log Message:
Don't compare a pointer  0; this is obviously a missed * here.
While here, remove shadow variable warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/util.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/kadmin/util.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1	Wed Apr 13 14:14:35 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/util.c	Thu Apr 21 13:56:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.1.1.1 2011/04/13 18:14:35 elric Exp $	*/
+/*	$NetBSD: util.c,v 1.2 2011/04/21 17:56:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
@@ -67,7 +67,7 @@
 { disallow-tgt-based,	KRB5_KDB_DISALLOW_TGT_BASED },
 { disallow-forwardable,	KRB5_KDB_DISALLOW_FORWARDABLE },
 { disallow-postdated,	KRB5_KDB_DISALLOW_POSTDATED },
-{ NULL }
+{ NULL, 0 }
 };
 
 /*
@@ -190,7 +190,7 @@
 if (str[0] == '+') {
 	str++;
 	*t = parse_time(str, month);
-	if (t  0)
+	if (*t  0)
 	return -1;
 	*t += time(NULL);
 	return 0;
@@ -432,7 +432,7 @@
  */
 
 int
-set_entry(krb5_context context,
+set_entry(krb5_context contextp,
 	  kadm5_principal_ent_t ent,
 	  int *mask,
 	  const char *max_ticket_life,
@@ -444,14 +444,14 @@
 if (max_ticket_life != NULL) {
 	if (parse_deltat (max_ticket_life, ent-max_life,
 			  mask, KADM5_MAX_LIFE)) {
-	krb5_warnx (context, unable to parse `%s', max_ticket_life);
+	krb5_warnx (contextp, unable to parse `%s', max_ticket_life);
 	return 1;
 	}
 }
 if (max_renewable_life != NULL) {
 	if (parse_deltat (max_renewable_life, ent-max_renewable_life,
 			  mask, KADM5_MAX_RLIFE)) {
-	krb5_warnx (context, unable to parse `%s', max_renewable_life);
+	krb5_warnx (contextp, unable to parse `%s', max_renewable_life);
 	return 1;
 	}
 }
@@ -459,21 +459,21 @@
 if (expiration) {
 	if (parse_timet (expiration, ent-princ_expire_time,
 			mask, KADM5_PRINC_EXPIRE_TIME)) {
-	krb5_warnx (context, unable to parse `%s', expiration);
+	krb5_warnx (contextp, unable to parse `%s', expiration);
 	return 1;
 	}
 }
 if (pw_expiration) {
 	if (parse_timet (pw_expiration, ent-pw_expiration,
 			 mask, KADM5_PW_EXPIRATION)) {
-	krb5_warnx (context, unable to parse `%s', pw_expiration);
+	krb5_warnx (contextp, unable to parse `%s', pw_expiration);
 	return 1;
 	}
 }
 if (attributes != NULL) {
 	if (parse_attributes (attributes, ent-attributes,
 			  mask, KADM5_ATTRIBUTES)) {
-	krb5_warnx (context, unable to parse `%s', attributes);
+	krb5_warnx (contextp, unable to parse `%s', attributes);
 	return 1;
 	}
 }

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 21 17:58:56 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: get.c

Log Message:
Fix signed/unsigned warnings. Discover bug where  0 case cannot happen,
and change it to = 0 as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/get.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/kadmin/get.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.1.1.1	Wed Apr 13 14:14:35 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/get.c	Thu Apr 21 13:58:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: get.c,v 1.1.1.1 2011/04/13 18:14:35 elric Exp $	*/
+/*	$NetBSD: get.c,v 1.2 2011/04/21 17:58:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
@@ -66,7 +66,7 @@
 { password, KADM5_TL_DATA, KRB5_TL_PASSWORD, KADM5_KEY_DATA, Password, Password, 0 },
 { pkinit-acl, KADM5_TL_DATA, KRB5_TL_PKINIT_ACL, 0, PK-INIT ACL, PK-INIT ACL, 0 },
 { aliases, KADM5_TL_DATA, KRB5_TL_ALIASES, 0, Aliases, Aliases, 0 },
-{ NULL }
+{ .fieldname = NULL }
 };
 
 struct field_info {
@@ -112,9 +112,9 @@
 static int
 cmp_salt (const krb5_salt *salt, const krb5_key_data *k)
 {
-if (salt-salttype != k-key_data_type[1])
+if (salt-salttype != (size_t)k-key_data_type[1])
 	return 1;
-if (salt-saltvalue.length != k-key_data_length[1])
+if (salt-saltvalue.length != (size_t)k-key_data_length[1])
 	return 1;
 return memcmp (salt-saltvalue.data, k-key_data_contents[1],
 		   salt-saltvalue.length);
@@ -247,7 +247,7 @@
 	krb5_tl_data *tl;
 
 	for (tl = princ-tl_data; tl != NULL; tl = tl-tl_data_next)
-	if (tl-tl_data_type == subfield)
+	if ((unsigned)tl-tl_data_type == subfield)
 		break;
 	if (tl == NULL) {
 	strlcpy(buf, , buf_len);
@@ -263,7 +263,8 @@
 	case KRB5_TL_PKINIT_ACL: {
 	HDB_Ext_PKINIT_acl acl;
 	size_t size;
-	int i, ret;
+	int ret;
+	size_t i;
 
 	ret = decode_HDB_Ext_PKINIT_acl(tl-tl_data_contents,
 	tl-tl_data_length,
@@ -295,7 +296,8 @@
 	case KRB5_TL_ALIASES: {
 	HDB_Ext_Aliases alias;
 	size_t size;
-	int i, ret;
+	int ret;
+	size_t i;
 
 	ret = decode_HDB_Ext_Aliases(tl-tl_data_contents,
 	 tl-tl_data_length,
@@ -311,7 +313,7 @@
 		ret = krb5_unparse_name(context, alias.aliases.val[i], p);
 		if (ret)
 		break;
-		if (i  0)
+		if (i  0)
 		strlcat(buf,  , buf_len);
 		strlcat(buf, p, buf_len);
 		free(p);

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

[Roland Dowdeswell]

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

[Roland Dowdeswell]

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)

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Thu Apr 14 18:18:16 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswdd.c

Log Message:
Turn inetd support back on.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.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/kpasswd/kpasswdd.c
diff -u src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c:1.1.1.1	Wed Apr 13 18:14:38 2011
+++ src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.c	Thu Apr 14 18:18:16 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kpasswdd.c,v 1.1.1.1 2011/04/13 18:14:38 elric Exp $	*/
+/*	$NetBSD: kpasswdd.c,v 1.2 2011/04/14 18:18:16 elric Exp $	*/
 
 /*
  * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -34,7 +34,7 @@
  */
 
 #include kpasswd_locl.h
-__RCSID($NetBSD: kpasswdd.c,v 1.1.1.1 2011/04/13 18:14:38 elric Exp $);
+__RCSID($NetBSD: kpasswdd.c,v 1.2 2011/04/14 18:18:16 elric Exp $);
 
 #include kadm5/admin.h
 #ifdef HAVE_SYS_UN_H
@@ -623,6 +623,34 @@
 krb5_auth_con_free (context, auth_context);
 }
 
+#ifdef INETD_SUPPORT
+/*
+ * XXX this code relies on getsockname() returning a valid local
+ * address for a connected DGRAM socket. This is true for most, but
+ * probably not all systems. For some systems, this could be done
+ * cleaner by using the IP_RECVDSTADDR option + recvmsg().
+ */
+static int
+get_local_addr(struct sockaddr *remote, int remlen,
+	   struct sockaddr *local, socklen_t *loclen)
+{
+	int s, ret;
+
+	s = socket(remote-sa_family, SOCK_DGRAM, 0);
+	if (s  0)
+		return -1;
+
+	if (connect(s, remote, remlen)  0) {
+		close(s);
+		return -1;
+	}
+
+	ret = getsockname(s, local, loclen);
+	close(s);
+	return ret;
+}
+#endif
+
 static int
 doit (krb5_keytab keytab, int port)
 {
@@ -631,15 +659,30 @@
 int maxfd;
 krb5_realm *realms;
 krb5_addresses addrs;
+krb5_address *my_addrp;
 unsigned n, i;
 fd_set real_fdset;
 struct sockaddr_storage __ss;
 struct sockaddr *sa = (struct sockaddr *)__ss;
+#ifdef INETD_SUPPORT
+int fdz;
+int from_inetd;
+socklen_t fromlen;
+krb5_address my_addr;
+struct sockaddr_storage __local;
+struct sockaddr *localsa = (struct sockaddr *)__local;
+#endif
 
 ret = krb5_get_default_realms(context, realms);
 if (ret)
 	krb5_err (context, 1, ret, krb5_get_default_realms);
 
+#ifdef INETD_SUPPORT
+fromlen = sizeof __ss;
+from_inetd = (getsockname(0, sa, fromlen) == 0);
+
+if (!from_inetd) {
+#endif
 if (explicit_addresses.len) {
 	addrs = explicit_addresses;
 } else {
@@ -678,6 +721,16 @@
 	krb5_errx (context, 1, fd too large);
 	FD_SET(sockets[i], real_fdset);
 }
+#ifdef INETD_SUPPORT
+} else {
+n = 1;
+maxfd = 0;
+	fdz = 0;
+sockets = fdz;
+FD_ZERO(real_fdset);
+FD_SET(0, real_fdset);
+}
+#endif
 if (maxfd == -1)
 	krb5_errx (context, 1, No sockets!);
 
@@ -705,19 +758,48 @@
 		else
 			krb5_err (context, 1, errno, recvfrom);
 		}
+#ifdef INETD_SUPPORT
+		if (from_inetd) {
+			socklen_t loclen = sizeof(__local);
+			int ret2;
+
+			ret2 = get_local_addr(sa, addrlen, localsa, loclen);
+			if (ret2  0)
+krb5_errx (context, errno, get_local_addr);
+			ret2 = krb5_sockaddr2address(context, localsa,
+			my_addr);
+			if (ret2)
+krb5_errx (context, ret2,
+krb5_sockaddr2address);
+			my_addrp = my_addr;
+		} else
+#endif
+		my_addrp = addrs.val[i];
 
 		process (realms, keytab, sockets[i],
-			 addrs.val[i],
+			 my_addrp,
 			 sa, addrlen,
 			 buf, ret);
+#ifdef INETD_SUPPORT
+		if (from_inetd) {
+		krb5_free_address(context, my_addr);
+		}
+#endif
 	}
+#ifdef INETD_SUPPORT
+	if (from_inetd)
+	break;
+#endif
 }
 
 for (i = 0; i  n; ++i)
 	close(sockets[i]);
 free(sockets);
 
-krb5_free_addresses (context, addrs);
+#ifdef INETD_SUPPORT
+if (!from_inetd)
+#endif
+	krb5_free_addresses (context, addrs);
 krb5_free_host_realm (context, realms);
 krb5_free_context (context);
 return 0;

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Thu Apr 14 18:21:32 UTC 2011

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

Log Message:
From prior location, handle ctime returning NULL.

revision 1.11
date: 2010/04/02 15:25:04;  author: christos;  state: Exp;
make it obvious to grep that ctime is being checked.

and

revision 1.10
date: 2010/04/02 15:23:17;  author: christos;  state: Exp;
handle ctime returning NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kuser/klist.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/klist.c
diff -u src/crypto/external/bsd/heimdal/dist/kuser/klist.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kuser/klist.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kuser/klist.c:1.1.1.1	Wed Apr 13 18:14:39 2011
+++ src/crypto/external/bsd/heimdal/dist/kuser/klist.c	Thu Apr 14 18:21:32 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: klist.c,v 1.1.1.1 2011/04/13 18:14:39 elric Exp $	*/
+/*	$NetBSD: klist.c,v 1.2 2011/04/14 18:21:32 elric Exp $	*/
 
 /*
  * Copyright (c) 1997-2008 Kungliga Tekniska Högskolan
@@ -41,21 +41,29 @@
 #include kcc-commands.h
 
 static char*
-printable_time(time_t t)
+printable_time_internal(time_t t, int x)
 {
 static char s[128];
-strlcpy(s, ctime(t)+ 4, sizeof(s));
-s[15] = 0;
+char *p;
+
+if ((p = ctime(t)) == NULL)
+	strlcpy(s, ?, sizeof(s));
+else
+	strlcpy(s, p + 4, sizeof(s));
+s[x] = 0;
 return s;
 }
 
 static char*
+printable_time(time_t t)
+{
+return printable_time_internal(t, 20);
+}
+
+static char*
 printable_time_long(time_t t)
 {
-static char s[128];
-strlcpy(s, ctime(t)+ 4, sizeof(s));
-s[20] = 0;
-return s;
+return printable_time_internal(t, 20);
 }
 
 #define COL_ISSUED		NP_(  Issued,)

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Thu Apr 14 18:22:35 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: revoke.c

Log Message:
From prior location:

revision 1.2
date: 2010/04/02 15:26:17;  author: christos;  state: Exp;
handle ctime returning NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.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/hx509/revoke.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c:1.1.1.1	Wed Apr 13 18:15:12 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/revoke.c	Thu Apr 14 18:22:35 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: revoke.c,v 1.1.1.1 2011/04/13 18:15:12 elric Exp $	*/
+/*	$NetBSD: revoke.c,v 1.2 2011/04/14 18:22:35 elric Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -1057,8 +1057,13 @@
 printable_time(time_t t)
 {
 static char s[128];
-strlcpy(s, ctime(t)+ 4, sizeof(s));
-s[20] = 0;
+char *p;
+if ((p = ctime(t)) == NULL)
+   strlcpy(s, ?, sizeof(s));
+else {
+   strlcpy(s, p + 4, sizeof(s));
+   s[20] = 0;
+}
 return s;
 }
 

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Thu Apr 14 18:23:24 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/vers: print_version.c

Log Message:
From prior location.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.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/vers/print_version.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.c:1.1.1.1	Wed Apr 13 18:15:44 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/vers/print_version.c	Thu Apr 14 18:23:23 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: print_version.c,v 1.1.1.1 2011/04/13 18:15:44 elric Exp $	*/
+/*	$NetBSD: print_version.c,v 1.2 2011/04/14 18:23:23 elric Exp $	*/
 
 /*
  * Copyright (c) 1998 - 2006 Kungliga Tekniska Högskolan
@@ -54,5 +54,7 @@
 	package_list = no version information;
 fprintf(stderr, %s (%s)\n, progname, package_list);
 fprintf(stderr, Copyright 1995-2011 Kungliga Tekniska Högskolan\n);
+#ifdef PACKAGE_BUGREPORT
 fprintf(stderr, Send bug-reports to %s\n, PACKAGE_BUGREPORT);
+#endif
 }

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Thu Apr 14 19:19:20 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/admin: ktutil.8
src/crypto/external/bsd/heimdal/dist/kadmin: kadmin.8 kadmind.8
src/crypto/external/bsd/heimdal/dist/kcm: kcm.8
src/crypto/external/bsd/heimdal/dist/kdc: hprop.8 hpropd.8 kdc.8
kstash.8 string2key.8
src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswdd.8
src/crypto/external/bsd/heimdal/dist/kuser: kdestroy.1 kgetcred.1
kimpersonate.8 kinit.1 klist.1
src/crypto/external/bsd/heimdal/dist/lib/gssapi: gssapi.3
src/crypto/external/bsd/heimdal/dist/lib/kadm5: iprop-log.8 iprop.8
src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_get_in_cred.3
krb5_init_context.3

Log Message:
Updates to man pages found as diffs in prior location in a batch.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/admin/ktutil.8
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/heimdal/dist/kcm/kcm.8
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8 \
src/crypto/external/bsd/heimdal/dist/kdc/hpropd.8 \
src/crypto/external/bsd/heimdal/dist/kdc/kdc.8 \
src/crypto/external/bsd/heimdal/dist/kdc/kstash.8 \
src/crypto/external/bsd/heimdal/dist/kdc/string2key.8
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kpasswd/kpasswdd.8
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 \
src/crypto/external/bsd/heimdal/dist/kuser/kgetcred.1 \
src/crypto/external/bsd/heimdal/dist/kuser/kimpersonate.8 \
src/crypto/external/bsd/heimdal/dist/kuser/kinit.1 \
src/crypto/external/bsd/heimdal/dist/kuser/klist.1
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop.8
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_get_in_cred.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_init_context.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/admin/ktutil.8
diff -u src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.1.1.2 src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.2
--- src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.1.1.2	Thu Apr 14 14:08:06 2011
+++ src/crypto/external/bsd/heimdal/dist/admin/ktutil.8	Thu Apr 14 19:19:19 2011
@@ -1,4 +1,4 @@
-.\	$NetBSD: ktutil.8,v 1.1.1.2 2011/04/14 14:08:06 elric Exp $
+.\	$NetBSD: ktutil.8,v 1.2 2011/04/14 19:19:19 elric Exp $
 .\
 .\ Copyright (c) 1997-2004 Kungliga Tekniska Högskolan
 .\ (Royal Institute of Technology, Stockholm, Sweden). 
@@ -55,72 +55,43 @@
 is a program for managing keytabs.
 Supported options:
 .Bl -tag -width Ds
-.It Xo
-.Fl v ,
-.Fl -verbose
-.Xc
+.It Fl v , Fl -verbose
 Verbose output.
 .El
 .Pp
 .Ar command
 can be one of the following:
 .Bl -tag -width srvconvert
-.It add Xo
-.Op Fl p Ar principal
-.Op Fl -principal= Ns Ar principal
-.Op Fl V Ar kvno
-.Op Fl -kvno= Ns Ar kvno
-.Op Fl e Ar enctype
-.Op Fl -enctype= Ns Ar enctype
-.Op Fl w Ar password
-.Op Fl -password= Ns Ar password
-.Op Fl r
-.Op Fl -random
-.Op Fl s
-.Op Fl -no-salt
-.Op Fl H
-.Op Fl -hex
-.Xc
+.It add Oo Fl p Ar principal Oc Oo Fl -principal= Ns Ar principal Oc \
+Oo Fl V Ar kvno Oc Oo Fl -kvno= Ns Ar kvno Oc Oo Fl e Ar enctype Oc \
+Oo Fl -enctype= Ns Ar enctype Oc Oo Fl w Ar password Oc \
+Oo Fl -password= Ns Ar password Oc Oo Fl r Oc Oo Fl -random Oc \
+Oo Fl s Oc Oo Fl -no-salt Oc Oo Fl H Oc Op Fl -hex
 Adds a key to the keytab. Options that are not specified will be
 prompted for. This requires that you know the password or the hex key of the
 principal to add; if what you really want is to add a new principal to
 the keytab, you should consider the
 .Ar get
 command, which talks to the kadmin server.
-.It change Xo
-.Op Fl r Ar realm
-.Op Fl -realm= Ns Ar realm
-.Op Fl -a Ar host
-.Op Fl -admin-server= Ns Ar host
-.Op Fl -s Ar port
-.Op Fl -server-port= Ns Ar port
-.Xc
+.It change Oo Fl r Ar realm Oc Oo Fl -realm= Ns Ar realm Oc \
+Oo Fl -a Ar host Oc Oo Fl -admin-server= Ns Ar host Oc \
+Oo Fl -s Ar port Oc Op Fl -server-port= Ns Ar port
 Update one or several keys to new versions.  By default, use the admin
 server for the realm of a keytab entry.  Otherwise it will use the
 values specified by the options.
 .Pp
 If no principals are given, all the ones in the keytab are updated.
-.It copy Xo
-.Ar keytab-src
-.Ar keytab-dest
-.Xc
+.It copy Ar keytab-src Ar 

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

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Wed Apr 13 18:23:42 UTC 2011

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

Log Message:
Conditionalise the sqlite3 HDB backend.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.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/hdb/hdb.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c:1.1.1.1	Wed Apr 13 18:14:42 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hdb/hdb.c	Wed Apr 13 18:23:42 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: hdb.c,v 1.1.1.1 2011/04/13 18:14:42 elric Exp $	*/
+/*	$NetBSD: hdb.c,v 1.2 2011/04/13 18:23:42 elric Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -80,7 +80,9 @@
 { HDB_INTERFACE_VERSION, ldap:,	hdb_ldap_create},
 { HDB_INTERFACE_VERSION, ldapi:,	hdb_ldapi_create},
 #endif
+#ifdef SQLITE3
 { HDB_INTERFACE_VERSION, sqlite:, hdb_sqlite_create},
+#endif
 {0, NULL,	NULL}
 };
 

CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5

[Roland Dowdeswell]

Module Name:src
Committed By:   elric
Date:   Wed Apr 13 18:30:04 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
init_sec_context.c

Log Message:
_gss_DES3_get_mic_compat() requires that ctx-target has been defined, and,
well, it hasn't yet.  Move the call down to after it is defined and things
are better.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_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/gssapi/krb5/init_sec_context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1	Wed Apr 13 18:14:45 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c	Wed Apr 13 18:30:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_sec_context.c,v 1.1.1.1 2011/04/13 18:14:45 elric Exp $	*/
+/*	$NetBSD: init_sec_context.c,v 1.2 2011/04/13 18:30:04 elric Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -424,10 +424,6 @@
 	goto failure;
 }
 
-ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
-if (ret)
-	goto failure;
-
 
 /*
  * This is hideous glue for (NFS) clients that wants to limit the
@@ -471,6 +467,10 @@
 
 ctx-lifetime = ctx-kcred-times.endtime;
 
+ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
+if (ret)
+	goto failure;
+
 ret = _gsskrb5_lifetime_left(minor_status,
  context,
  ctx-lifetime,