[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-853-g8d3944c

[Brad King]

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  8d3944cc9860454b1309ce8932cc15a94536964b (commit)
       via  231ec7854b464159ec1ec734a052ae651f400bb5 (commit)
      from  03c259301d72cb598b89123acc7a478bae9c9c32 (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=8d3944cc9860454b1309ce8932cc15a94536964b
commit 8d3944cc9860454b1309ce8932cc15a94536964b
Merge: 03c2593 231ec78
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:30:23 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 22 09:30:23 2015 -0400

    Merge topic 'update-libarchive' into next
    
    231ec785 fixup! libarchive: Use CommonCrypto APIs on OS X only when available


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=231ec7854b464159ec1ec734a052ae651f400bb5
commit 231ec7854b464159ec1ec734a052ae651f400bb5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 22 09:29:48 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 22 09:29:48 2015 -0400

    fixup! libarchive: Use CommonCrypto APIs on OS X only when available

diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
index fb7307e..efd350d 100644
--- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c
+++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c
@@ -115,6 +115,9 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt,
 #endif
 
 #ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto
+# if MAC_OS_X_VERSION_MAX_ALLOWED < 1090
+#  define kCCAlgorithmAES kCCAlgorithmAES128
+# endif
 
 static int
 aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len)

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

Summary of changes:
 Utilities/cmlibarchive/libarchive/archive_cryptor.c |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake