[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6c13488c4e75ef839bc07a3ce428289aef4bd267 (commit)
      from  4b8736a22e758c371bc2f8b3534dc0c274acf42c (commit)


- Log -----------------------------------------------------------------
commit 6c13488c4e75ef839bc07a3ce428289aef4bd267
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Apr 4 16:55:12 2016 +0200

    Make sure the rand_byte buffer in padlock engine is cleansed.
    
    Submitted by Michael McConville <mmcco at mykolab.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 engines/e_padlock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index 96e7483..f474f50 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -776,7 +776,7 @@ static int padlock_rand_bytes(unsigned char *output, int count)
         *output++ = (unsigned char)buf;
         count--;
     }
-    *(volatile unsigned int *)&buf = 0;
+    OPENSSL_cleanse(&buf, sizeof(buf));
 
     return 1;
 }