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;
