mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #495 from toddouska/rng-redef 

fix WC_RNG redeclare
This commit is contained in:
dgarske 2016-07-20 19:22:08 -07:00 committed by GitHub
parent b265666174 2c92fee59f
commit e920e6cee0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wolfssl/ssl.h
View File

@ -74,7 +74,6 @@ typedef struct WOLFSSL_X509_CHAIN WOLFSSL_X509_CHAIN;
typedef struct WOLFSSL_CERT_MANAGER WOLFSSL_CERT_MANAGER;
typedef struct WOLFSSL_SOCKADDR WOLFSSL_SOCKADDR;
typedef struct WC_RNG WC_RNG;
/* redeclare guard */
#define WOLFSSL_TYPES_DEFINED
@ -84,6 +83,11 @@ typedef struct WOLFSSL_RSA WOLFSSL_RSA;
#define WOLFSSL_RSA_TYPE_DEFINED
#endif
#ifndef WC_RNG_TYPE_DEFINED /* guard on redeclaration */
typedef struct WC_RNG WC_RNG;
#define WC_RNG_TYPE_DEFINED
#endif
typedef struct WOLFSSL_DSA WOLFSSL_DSA;
typedef struct WOLFSSL_EC_KEY WOLFSSL_EC_KEY;
typedef struct WOLFSSL_EC_POINT WOLFSSL_EC_POINT;

13
wolfssl/wolfcrypt/random.h
View File

@ -76,6 +76,11 @@ typedef struct OS_Seed {
} OS_Seed;
#ifndef WC_RNG_TYPE_DEFINED /* guard on redeclaration */
typedef struct WC_RNG WC_RNG;
#define WC_RNG_TYPE_DEFINED
#endif
#if (defined(HAVE_HASHDRBG) || defined(NO_RC4)) && !defined(CUSTOM_RAND_GENERATE_BLOCK)
#define DRBG_SEED_LEN (440/8)
@ -85,12 +90,12 @@ struct DRBG; /* Private DRBG state */
/* Hash-based Deterministic Random Bit Generator */
typedef struct WC_RNG {
struct WC_RNG {
struct DRBG* drbg;
OS_Seed seed;
void* heap;
byte status;
} WC_RNG;
};
@ -101,7 +106,7 @@ typedef struct WC_RNG {
/* secure Random Number Generator */
typedef struct WC_RNG {
struct WC_RNG {
OS_Seed seed;
#ifndef NO_RC4
Arc4 cipher;
@ -110,7 +115,7 @@ typedef struct WC_RNG {
int devId; /* nitrox device id */
word32 magic; /* using cavium magic */
#endif
} WC_RNG;
};