wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix redefinition warning on older clang compiler

Browse Source
This commit is contained in:
Jacob Barthelmeh
2020-01-30 14:39:12 -07:00
committed by Eric Blankenhorn
parent 51d55ed1c8
commit 3eee891cf5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfssl/openssl/evp.h
View File

@@ -67,6 +67,7 @@ typedef char WOLFSSL_EVP_CIPHER;
#ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */ #ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */
typedef char WOLFSSL_EVP_MD; 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 #define WOLFSSL_EVP_TYPE_DEFINED
#endif #endif
@@ -161,7 +162,7 @@ typedef union {
typedef struct WOLFSSL_EVP_PKEY_CTX WOLFSSL_EVP_PKEY_CTX; typedef struct WOLFSSL_EVP_PKEY_CTX WOLFSSL_EVP_PKEY_CTX;
typedef struct WOLFSSL_EVP_CIPHER_CTX WOLFSSL_EVP_CIPHER_CTX; typedef struct WOLFSSL_EVP_CIPHER_CTX WOLFSSL_EVP_CIPHER_CTX;
typedef struct WOLFSSL_EVP_MD_CTX { struct WOLFSSL_EVP_MD_CTX {
union { union {
WOLFSSL_Hasher digest; WOLFSSL_Hasher digest;
#ifndef NO_HMAC #ifndef NO_HMAC
@@ -170,7 +171,7 @@ typedef struct WOLFSSL_EVP_MD_CTX {
} hash; } hash;
unsigned char macType; unsigned char macType;
WOLFSSL_EVP_PKEY_CTX *pctx; WOLFSSL_EVP_PKEY_CTX *pctx;
} WOLFSSL_EVP_MD_CTX; };
typedef union { typedef union {

3
wolfssl/ssl.h
View File

@@ -348,10 +348,9 @@ struct WOLFSSL_EVP_PKEY {
#endif #endif
}; };
typedef struct WOLFSSL_EVP_PKEY WOLFSSL_PKCS8_PRIV_KEY_INFO; 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 */ #ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */
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;
typedef char WOLFSSL_EVP_MD; typedef char WOLFSSL_EVP_MD;
#define WOLFSSL_EVP_TYPE_DEFINED #define WOLFSSL_EVP_TYPE_DEFINED
#endif #endif