===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/Attic/key.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- src/usr.bin/ssh/Attic/key.c	2014/01/09 23:20:00	1.115
+++ src/usr.bin/ssh/Attic/key.c	2014/02/02 03:44:31	1.116
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.115 2014/01/09 23:20:00 djm Exp $ */
+/* $OpenBSD: key.c,v 1.116 2014/02/02 03:44:31 djm Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -233,12 +233,12 @@
 	case KEY_ED25519:
 	case KEY_ED25519_CERT:
 		if (k->ed25519_pk) {
-			memset(k->ed25519_pk, 0, ED25519_PK_SZ);
+			explicit_bzero(k->ed25519_pk, ED25519_PK_SZ);
 			free(k->ed25519_pk);
 			k->ed25519_pk = NULL;
 		}
 		if (k->ed25519_sk) {
-			memset(k->ed25519_sk, 0, ED25519_SK_SZ);
+			explicit_bzero(k->ed25519_sk, ED25519_SK_SZ);
 			free(k->ed25519_sk);
 			k->ed25519_sk = NULL;
 		}
@@ -402,7 +402,7 @@
 		if ((ssh_digest_memory(hash_alg, blob, len,
 		    retval, SSH_DIGEST_MAX_LENGTH)) != 0)
 			fatal("%s: digest_memory failed", __func__);
-		memset(blob, 0, len);
+		explicit_bzero(blob, len);
 		free(blob);
 		*dgst_raw_length = ssh_digest_bytes(hash_alg);
 	} else {
@@ -610,7 +610,7 @@
 		    dgst_rep);
 		break;
 	}
-	memset(dgst_raw, 0, dgst_raw_len);
+	explicit_bzero(dgst_raw, dgst_raw_len);
 	free(dgst_raw);
 	return retval;
 }
@@ -1687,7 +1687,7 @@
 		*blobp = xmalloc(len);
 		memcpy(*blobp, buffer_ptr(&b), len);
 	}
-	memset(buffer_ptr(&b), 0, len);
+	explicit_bzero(buffer_ptr(&b), len);
 	buffer_free(&b);
 	return len;
 }