From 3eee891cf5c8b779077f56aed2b292d306374629 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Thu, 30 Jan 2020 14:39:12 -0700 Subject: [PATCH] fix redefinition warning on older clang compiler --- wolfssl/openssl/evp.h | 7 ++++--- wolfssl/ssl.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h index 1b0260bcb..ed6cc569e 100644 --- a/wolfssl/openssl/evp.h +++ b/wolfssl/openssl/evp.h @@ -66,7 +66,8 @@ typedef char WOLFSSL_EVP_CIPHER; #ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */ typedef char WOLFSSL_EVP_MD; -typedef struct WOLFSSL_EVP_PKEY WOLFSSL_EVP_PKEY; +typedef struct WOLFSSL_EVP_PKEY WOLFSSL_EVP_PKEY; +typedef struct WOLFSSL_EVP_MD_CTX WOLFSSL_EVP_MD_CTX; #define WOLFSSL_EVP_TYPE_DEFINED #endif @@ -161,7 +162,7 @@ typedef union { typedef struct WOLFSSL_EVP_PKEY_CTX WOLFSSL_EVP_PKEY_CTX; typedef struct WOLFSSL_EVP_CIPHER_CTX WOLFSSL_EVP_CIPHER_CTX; -typedef struct WOLFSSL_EVP_MD_CTX { +struct WOLFSSL_EVP_MD_CTX { union { WOLFSSL_Hasher digest; #ifndef NO_HMAC @@ -170,7 +171,7 @@ typedef struct WOLFSSL_EVP_MD_CTX { } hash; unsigned char macType; WOLFSSL_EVP_PKEY_CTX *pctx; -} WOLFSSL_EVP_MD_CTX; +}; typedef union { diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index c009911dd..cfa4c1195 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -348,10 +348,9 @@ struct WOLFSSL_EVP_PKEY { #endif }; typedef struct WOLFSSL_EVP_PKEY WOLFSSL_PKCS8_PRIV_KEY_INFO; -typedef struct WOLFSSL_EVP_MD_CTX WOLFSSL_EVP_MD_CTX; - #ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */ typedef struct WOLFSSL_EVP_PKEY WOLFSSL_EVP_PKEY; +typedef struct WOLFSSL_EVP_MD_CTX WOLFSSL_EVP_MD_CTX; typedef char WOLFSSL_EVP_MD; #define WOLFSSL_EVP_TYPE_DEFINED #endif