[src/trunk]: src/crypto/external/bsd/heimdal/dist/lib Fix sizeof errors in me...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/19105b6955ff
branches:  trunk
changeset: 328131:19105b6955ff
user:      apb <apb%NetBSD.org@localhost>
date:      Thu Mar 27 16:10:45 2014 +0000

description:
Fix sizeof errors in memset calls in heimdal.

diffstat:

 crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c      |  4 ++--
 crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c         |  4 ++--
 crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c            |  6 +++---
 crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (79 lines):

diff -r c2765f5c62ec -r 19105b6955ff crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
--- a/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c     Thu Mar 27 15:50:48 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c     Thu Mar 27 16:10:45 2014 +0000
@@ -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 @@
     if(engine->destroy)
        (*engine->destroy)(engine);
 
-    memset(engine, 0, sizeof(engine));
+    memset(engine, 0, sizeof(*engine));
     engine->references = -1;
 
 
diff -r c2765f5c62ec -r 19105b6955ff crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
--- a/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c        Thu Mar 27 15:50:48 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c        Thu Mar 27 16:10:45 2014 +0000
@@ -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_Update(m, pad, 16);
 
     memcpy(res, m->state, MD2_DIGEST_LENGTH);
-    memset(m, 0, sizeof(m));
+    memset(m, 0, sizeof(*m));
 }
diff -r c2765f5c62ec -r 19105b6955ff crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
--- a/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c   Thu Mar 27 15:50:48 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c   Thu Mar 27 16:10:45 2014 +0000
@@ -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 @@
                                 password,
                                 principal,
                                 &(*keys)[0]);
-       memset(password, 0, sizeof(password));
+       memset(password, 0, plen);
        if (ret) {
            free(*keys);
            *keys = NULL;
diff -r c2765f5c62ec -r 19105b6955ff crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
--- a/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c        Thu Mar 27 15:50:48 2014 +0000
+++ b/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c        Thu Mar 27 16:10:45 2014 +0000
@@ -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 @@
     AlgorithmIdentifier ai;
     size_t size;
 
-    memset(&ticket, 0, sizeof(&ticket));
+    memset(&ticket, 0, sizeof(ticket));
 
     ai.algorithm = *c->oid;
     ai.parameters = NULL;