[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-537-g8e3c673
Kitware Robot
kwrobot at kitware.com
Tue Mar 21 11:15:02 EDT 2017
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 8e3c673adebb25f95ca63a55d7ebf2b87c1f3e83 (commit)
via 18009aaf5e1d8a436f251b6f70ac46bcad1ad768 (commit)
from 8ef278aad3a55c747e5af1ead666a44b25ce5bcd (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e3c673adebb25f95ca63a55d7ebf2b87c1f3e83
commit 8e3c673adebb25f95ca63a55d7ebf2b87c1f3e83
Merge: 8ef278a 18009aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 15:13:09 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 11:13:13 2017 -0400
Stage topic 'libarchive-backport-rc4-crypto-rec'
Topic-id: 23145
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/598
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18009aaf5e1d8a436f251b6f70ac46bcad1ad768
commit 18009aaf5e1d8a436f251b6f70ac46bcad1ad768
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 11:05:28 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 11:09:25 2017 -0400
libarchive: backport rc4 crypto requirement update
Backport upstream libarchive commit 70f497f456 (As per Cryptographic
Requirements, 2017-03-19). Discard more bytes of the RC4 keystream
to reduce the possibility of non-random bytes.
diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c
index a20b9b1..fcea6c6 100644
--- a/Utilities/cmlibarchive/libarchive/archive_random.c
+++ b/Utilities/cmlibarchive/libarchive/archive_random.c
@@ -222,7 +222,7 @@ arc4_stir(void)
* Discard early keystream, as per recommendations in:
* "(Not So) Random Shuffles of RC4" by Ilya Mironov.
*/
- for (i = 0; i < 1024; i++)
+ for (i = 0; i < 3072; i++)
(void)arc4_getbyte();
arc4_count = 1600000;
}
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmlibarchive/libarchive/archive_random.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list