| commit | 754106713fd349be267ec0dfe6f4f8a97c1b3cdb | [log] [tgz] |
|---|---|---|
| author | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| committer | Alexandre Savard <alexandre.savard@savoirfairelinux.com> | Wed Aug 08 09:50:01 2012 -0400 |
| tree | 767702dc681aea550f7c8c626e936e019981b7dc | |
| parent | ace91efcc58b8704c3e8e9c03e33afc1a59aecc3 [diff] [blame] |
#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/sha/sha_locl.h b/jni/openssl/crypto/sha/sha_locl.h index 7a0c3ca..672c26e 100644 --- a/jni/openssl/crypto/sha/sha_locl.h +++ b/jni/openssl/crypto/sha/sha_locl.h
@@ -122,11 +122,7 @@ #define INIT_DATA_h3 0x10325476UL #define INIT_DATA_h4 0xc3d2e1f0UL -#ifdef SHA_0 -fips_md_init(SHA) -#else -fips_md_init_ctx(SHA1, SHA) -#endif +int HASH_INIT (SHA_CTX *c) { memset (c,0,sizeof(*c)); c->h0=INIT_DATA_h0;