[Cmake-commits] CMake branch, next, updated. v2.8.6-1937-g0555ea3

Brad King brad.king at kitware.com
Thu Nov 17 11:20:37 EST 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0555ea34fb72434d5c094945ffaf49f9af5a0c41 (commit)
       via  6d4b993a1306201bd9bbccc6d272044dc99572fd (commit)
      from  d2a781d6324fcb0b0b5fa7ce69ffa169f8947318 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0555ea34fb72434d5c094945ffaf49f9af5a0c41
commit 0555ea34fb72434d5c094945ffaf49f9af5a0c41
Merge: d2a781d 6d4b993
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 11:20:34 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 17 11:20:34 2011 -0500

    Merge topic 'crypto-hash' into next
    
    6d4b993 sha2: Zero entire SHA_CTX structure during cleanup


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d4b993a1306201bd9bbccc6d272044dc99572fd
commit 6d4b993a1306201bd9bbccc6d272044dc99572fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 17 11:18:08 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 17 11:18:08 2011 -0500

    sha2: Zero entire SHA_CTX structure during cleanup
    
    Convert lines of the form
    
      MEMSET_BZERO(context, sizeof(context));
    
    to the correct form
    
      MEMSET_BZERO(context, sizeof(*context));
    
    as suggested by Clang.

diff --git a/Source/cm_sha2.c b/Source/cm_sha2.c
index b1798a8..12c39ed 100644
--- a/Source/cm_sha2.c
+++ b/Source/cm_sha2.c
@@ -704,7 +704,7 @@ void SHA1_Final(sha_byte digest[], SHA_CTX* context) {
 		 * No digest buffer, so we can do nothing
 		 * except clean up and go home
 		 */
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 		return;
 	}
 
@@ -760,7 +760,7 @@ void SHA1_Final(sha_byte digest[], SHA_CTX* context) {
 #endif
 
 	/* Clean up: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA1_End(SHA_CTX* context, char buffer[]) {
@@ -780,7 +780,7 @@ char *SHA1_End(SHA_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA1_DIGEST_LENGTH);
 	return buffer;
@@ -1099,7 +1099,7 @@ void SHA256_Final(sha_byte digest[], SHA_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA256_End(SHA_CTX* context, char buffer[]) {
@@ -1119,7 +1119,7 @@ char *SHA256_End(SHA_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH);
 	return buffer;
@@ -1173,7 +1173,7 @@ void SHA224_Final(sha_byte digest[], SHA_CTX* context) {
 	}
 
 	/* Clean up state data: */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA224_End(SHA_CTX* context, char buffer[]) {
@@ -1193,7 +1193,7 @@ char *SHA224_End(SHA_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA224_DIGEST_LENGTH);
 	return buffer;
@@ -1508,7 +1508,7 @@ void SHA512_Final(sha_byte digest[], SHA_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA512_End(SHA_CTX* context, char buffer[]) {
@@ -1528,7 +1528,7 @@ char *SHA512_End(SHA_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH);
 	return buffer;
@@ -1578,7 +1578,7 @@ void SHA384_Final(sha_byte digest[], SHA_CTX* context) {
 	}
 
 	/* Zero out state data */
-	MEMSET_BZERO(context, sizeof(context));
+	MEMSET_BZERO(context, sizeof(*context));
 }
 
 char *SHA384_End(SHA_CTX* context, char buffer[]) {
@@ -1598,7 +1598,7 @@ char *SHA384_End(SHA_CTX* context, char buffer[]) {
 		}
 		*buffer = (char)0;
 	} else {
-		MEMSET_BZERO(context, sizeof(context));
+		MEMSET_BZERO(context, sizeof(*context));
 	}
 	MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH);
 	return buffer;

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

Summary of changes:
 Source/cm_sha2.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list