[Cmake-commits] CMake branch, next, updated. v3.1.0-rc3-1215-g865ed26
Brad King
brad.king at kitware.com
Wed Dec 17 13:55:43 EST 2014
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 865ed261e6f50705f4db55e7d9a193af08d7f8b9 (commit)
via d4d2d72f5d28e044d18ff5479ee55d872c9c5746 (commit)
from 23fefd0ba3d758fd095b2e662ade88df2350a520 (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=865ed261e6f50705f4db55e7d9a193af08d7f8b9
commit 865ed261e6f50705f4db55e7d9a193af08d7f8b9
Merge: 23fefd0 d4d2d72
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 13:55:42 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 17 13:55:42 2014 -0500
Merge topic 'fix-sha2-cast-constness' into next
d4d2d72f sha2: Fix -Wcast-qual warnings by adding const to some casts
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4d2d72f5d28e044d18ff5479ee55d872c9c5746
commit d4d2d72f5d28e044d18ff5479ee55d872c9c5746
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Wed Dec 17 11:59:21 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 13:53:04 2014 -0500
sha2: Fix -Wcast-qual warnings by adding const to some casts
diff --git a/Source/cm_sha2.c b/Source/cm_sha2.c
index 4738920..b90e060 100644
--- a/Source/cm_sha2.c
+++ b/Source/cm_sha2.c
@@ -663,7 +663,7 @@ void SHA1_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
context->s1.bitcount += freespace << 3;
len -= freespace;
data += freespace;
- SHA1_Internal_Transform(context, (sha_word32*)context->s1.buffer);
+ SHA1_Internal_Transform(context, (const sha_word32*)context->s1.buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->s1.buffer[usedspace], data, len);
@@ -675,7 +675,7 @@ void SHA1_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
}
while (len >= 64) {
/* Process as many complete blocks as we can */
- SHA1_Internal_Transform(context, (sha_word32*)data);
+ SHA1_Internal_Transform(context, (const sha_word32*)data);
context->s1.bitcount += 512;
len -= 64;
data += 64;
@@ -724,7 +724,7 @@ void SHA1_Final(sha_byte digest[], SHA_CTX* context) {
MEMSET_BZERO(&context->s1.buffer[usedspace], 64 - usedspace);
}
/* Do second-to-last transform: */
- SHA1_Internal_Transform(context, (sha_word32*)context->s1.buffer);
+ SHA1_Internal_Transform(context, (const sha_word32*)context->s1.buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->s1.buffer, 56);
@@ -741,7 +741,7 @@ void SHA1_Final(sha_byte digest[], SHA_CTX* context) {
sizeof(sha_word64));
/* Final transform: */
- SHA1_Internal_Transform(context, (sha_word32*)context->s1.buffer);
+ SHA1_Internal_Transform(context, (const sha_word32*)context->s1.buffer);
/* Save the hash data for output: */
#if BYTE_ORDER == LITTLE_ENDIAN
@@ -1004,7 +1004,7 @@ void SHA256_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
context->s256.bitcount += freespace << 3;
len -= freespace;
data += freespace;
- SHA256_Internal_Transform(context, (sha_word32*)context->s256.buffer);
+ SHA256_Internal_Transform(context, (const sha_word32*)context->s256.buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->s256.buffer[usedspace], data, len);
@@ -1016,7 +1016,7 @@ void SHA256_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
}
while (len >= 64) {
/* Process as many complete blocks as we can */
- SHA256_Internal_Transform(context, (sha_word32*)data);
+ SHA256_Internal_Transform(context, (const sha_word32*)data);
context->s256.bitcount += 512;
len -= 64;
data += 64;
@@ -1050,7 +1050,7 @@ void SHA256_Internal_Last(SHA_CTX* context) {
MEMSET_BZERO(&context->s256.buffer[usedspace], 64 - usedspace);
}
/* Do second-to-last transform: */
- SHA256_Internal_Transform(context, (sha_word32*)context->s256.buffer);
+ SHA256_Internal_Transform(context, (const sha_word32*)context->s256.buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->s256.buffer, 56);
@@ -1069,7 +1069,7 @@ void SHA256_Internal_Last(SHA_CTX* context) {
sizeof(sha_word64));
/* Final transform: */
- SHA256_Internal_Transform(context, (sha_word32*)context->s256.buffer);
+ SHA256_Internal_Transform(context, (const sha_word32*)context->s256.buffer);
}
void SHA256_Final(sha_byte digest[], SHA_CTX* context) {
@@ -1412,7 +1412,7 @@ void SHA512_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
ADDINC128(context->s512.bitcount, freespace << 3);
len -= freespace;
data += freespace;
- SHA512_Internal_Transform(context, (sha_word64*)context->s512.buffer);
+ SHA512_Internal_Transform(context, (const sha_word64*)context->s512.buffer);
} else {
/* The buffer is not yet full */
MEMCPY_BCOPY(&context->s512.buffer[usedspace], data, len);
@@ -1424,7 +1424,7 @@ void SHA512_Update(SHA_CTX* context, const sha_byte *data, size_t len) {
}
while (len >= 128) {
/* Process as many complete blocks as we can */
- SHA512_Internal_Transform(context, (sha_word64*)data);
+ SHA512_Internal_Transform(context, (const sha_word64*)data);
ADDINC128(context->s512.bitcount, 1024);
len -= 128;
data += 128;
@@ -1459,7 +1459,7 @@ void SHA512_Internal_Last(SHA_CTX* context) {
MEMSET_BZERO(&context->s512.buffer[usedspace], 128 - usedspace);
}
/* Do second-to-last transform: */
- SHA512_Internal_Transform(context, (sha_word64*)context->s512.buffer);
+ SHA512_Internal_Transform(context, (const sha_word64*)context->s512.buffer);
/* And set-up for the last transform: */
MEMSET_BZERO(context->s512.buffer, 112);
@@ -1480,7 +1480,7 @@ void SHA512_Internal_Last(SHA_CTX* context) {
sizeof(sha_word64));
/* Final transform: */
- SHA512_Internal_Transform(context, (sha_word64*)context->s512.buffer);
+ SHA512_Internal_Transform(context, (const sha_word64*)context->s512.buffer);
}
void SHA512_Final(sha_byte digest[], SHA_CTX* context) {
-----------------------------------------------------------------------
Summary of changes:
Source/cm_sha2.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list