Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 8 insertions, 8 deletions

diff --git a/packet.c b/packet.c
index 6cf7edbb8..54c0558f9 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.191 2013/12/06 13:34:54 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.192 2014/02/02 03:44:31 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -764,9 +764,9 @@ set_newkeys(int mode)
                 mac  = &active_state->newkeys[mode]->mac;
                 comp = &active_state->newkeys[mode]->comp;
                 mac_clear(mac);
-                memset(enc->iv,  0, enc->iv_len);
-                memset(enc->key, 0, enc->key_len);
-                memset(mac->key, 0, mac->key_len);
+                explicit_bzero(enc->iv,  enc->iv_len);
+                explicit_bzero(enc->key, enc->key_len);
+                explicit_bzero(mac->key, mac->key_len);
                 free(enc->name);
                 free(enc->iv);
                 free(enc->key);
@@ -787,9 +787,9 @@ set_newkeys(int mode)
         cipher_init(cc, enc->cipher, enc->key, enc->key_len,
             enc->iv, enc->iv_len, crypt_type);
         /* Deleting the keys does not gain extra security */
-        /* memset(enc->iv,  0, enc->block_size);
-           memset(enc->key, 0, enc->key_len);
-           memset(mac->key, 0, mac->key_len); */
+        /* explicit_bzero(enc->iv,  enc->block_size);
+           explicit_bzero(enc->key, enc->key_len);
+           explicit_bzero(mac->key, mac->key_len); */
         if ((comp->type == COMP_ZLIB ||
             (comp->type == COMP_DELAYED &&
              active_state->after_authentication)) && comp->enabled == 0) {
@@ -928,7 +928,7 @@ packet_send2_wrapped(void)
                 }
         } else {
                 /* clear padding */
-                memset(cp, 0, padlen);
+                explicit_bzero(cp, padlen);
         }
         /* sizeof (packet_len + pad_len + payload + padding) */
         len = buffer_len(&active_state->outgoing_packet);