commit 902870e3b55f6d970d0f956b1571ae18afb2f7fd
author Adam Langley <agl@google.com> Fri Dec 04 13:17:57 2015 -0800
committer Adam Langley <agl@google.com> Fri Dec 04 22:13:19 2015 +0000
tree 0b10e9d69e60a348b479b03d70d5e6890d003e46
parent 34aa55c05e85d510c606274396c7236742c86607

Gate SHA_CTX compatibility on !WINDOWS.

Windows does support anonymous unions but warns about it. Since I'm not
sure what warnings we have enabled in Chromium, this change just drops
the union for Windows.

Change-Id: I914f8cd5855eb07153105250c0f026eaedb35365
Reviewed-on: https://boringssl-review.googlesource.com/6631
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/sha.h

diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index 42875f1..423510d 100644
--- a/include/openssl/sha.h
+++ b/include/openssl/sha.h
@@ -98,8 +98,11 @@
 OPENSSL_EXPORT void SHA1_Transform(SHA_CTX *sha, const uint8_t *block);
 
 struct sha_state_st {
+#if defined(OPENSSL_WINDOWS)
+  uint32_t h[5];
+#else
   /* wpa_supplicant accesses |h0|..|h4| so we must support those names
-   * for compatibility. */
+   * for compatibility with it until it can be updated. */
   union {
     uint32_t h[5];
     struct {
@@ -110,7 +113,7 @@
       uint32_t h4;
     };
   };
-
+#endif
   uint32_t Nl, Nh;
   uint32_t data[16];
   unsigned int num;