diff --git a/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c b/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
index 0f0021a2dd71..7ed2489f9dc5 100644
--- a/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
+++ b/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
@@ -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;
 
 
diff --git a/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c b/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
index 4ee8d3dfc338..7ccc4d091c40 100644
--- a/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
+++ b/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
@@ -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));
 }
diff --git a/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c b/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
index 80d725c2d9f0..e830a2257297 100644
--- a/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
+++ b/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
@@ -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_handle,
 				 password,
 				 principal,
 				 &(*keys)[0]);
-	memset(password, 0, sizeof(password));
+	memset(password, 0, plen);
 	if (ret) {
 	    free(*keys);
 	    *keys = NULL;
diff --git a/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c b/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
index 9013483ee1ce..786c359996f8 100644
--- a/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
+++ b/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
@@ -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, struct testcase *c)
     AlgorithmIdentifier ai;
     size_t size;
 
-    memset(&ticket, 0, sizeof(&ticket));
+    memset(&ticket, 0, sizeof(ticket));
 
     ai.algorithm = *c->oid;
     ai.parameters = NULL;