Merge pull request #872 from JacobBarthelmeh/Testing

handle redefinition warnings
This commit is contained in:
dgarske
2017-04-24 15:08:13 -07:00
committed by GitHub

View File

@@ -25,14 +25,23 @@
#define WOLF_CRYPT_ASN_PUBLIC_H #define WOLF_CRYPT_ASN_PUBLIC_H
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
#ifdef HAVE_ECC
#include <wolfssl/wolfcrypt/ecc.h>
#endif
#if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
#include <wolfssl/wolfcrypt/rsa.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Opaque keys. Only key pointers are used for arguments */ #ifndef HAVE_ECC
typedef struct ecc_key ecc_key; typedef struct ecc_key ecc_key;
typedef struct RsaKey RsaKey; #endif
#ifdef NO_RSA
typedef struct RsaKey RsaKey;
#endif
#ifndef WC_RNG_TYPE_DEFINED /* guard on redeclaration */ #ifndef WC_RNG_TYPE_DEFINED /* guard on redeclaration */
typedef struct WC_RNG WC_RNG; typedef struct WC_RNG WC_RNG;
#define WC_RNG_TYPE_DEFINED #define WC_RNG_TYPE_DEFINED