From: Tim Kientzle <kientzle@gmail.com>
Date: Wed, 5 Oct 2011 05:01:31 +0000 (-0400)
Subject: Fix a typo that prevented CommonCrypto (part of libSystem) from being
X-Git-Tag: v3.0.0a~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02df78ff6381e81af490db8b609d09172a2b14f1;p=thirdparty%2Flibarchive.git

Fix a typo that prevented CommonCrypto (part of libSystem) from being
properly used on Darwin.

Note that Mac OS X 10.7 has deprecated OpenSSL in favor of CommonCrypto.
We still pick up RIPEMD160 from OpenSSL if it's available, which breaks
strict warnings because of the deprecation.  This seems unavoidable;
CommonCrypto doesn't seem to support RIPEMD160.  To avoid the deprecation
warning on Mac OS X 10.7, disable the OpenSSL checks.  That loses
RIPEMD160 support, though.

SVN-Revision: 3733
---

diff --git a/libarchive/archive_crypto_private.h b/libarchive/archive_crypto_private.h
index 9b726ccab..4a7f2d40e 100644
--- a/libarchive/archive_crypto_private.h
+++ b/libarchive/archive_crypto_private.h
@@ -171,7 +171,7 @@ typedef SHA256_CTX archive_sha256_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA256_LIBC3)
 typedef SHA2_CTX archive_sha256_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA256_LIBSYSTEM)
-typedef CC_SHA256_CTX archive_shs256_ctx;
+typedef CC_SHA256_CTX archive_sha256_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA256_NETTLE)
 typedef struct sha256_ctx archive_sha256_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA256_OPENSSL)
@@ -189,7 +189,7 @@ typedef SHA384_CTX archive_sha384_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA384_LIBC3)
 typedef SHA2_CTX archive_sha384_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA384_LIBSYSTEM)
-typedef CC_SHA512_CTX archive_shs384_ctx;
+typedef CC_SHA512_CTX archive_sha384_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA384_NETTLE)
 typedef struct sha384_ctx archive_sha384_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA384_OPENSSL)
@@ -207,7 +207,7 @@ typedef SHA512_CTX archive_sha512_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA512_LIBC3)
 typedef SHA2_CTX archive_sha512_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA512_LIBSYSTEM)
-typedef CC_SHA512_CTX archive_shs512_ctx;
+typedef CC_SHA512_CTX archive_sha512_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA512_NETTLE)
 typedef struct sha512_ctx archive_sha512_ctx;
 #elif defined(ARCHIVE_CRYPTO_SHA512_OPENSSL)