diff options
| author | Randall S. Becker <rsbecker@nexbridge.com> | 2021-03-29 10:26:10 -0600 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-03-31 13:28:46 +1000 |
| commit | 35bc387b97a51343456d1d72e19a64779d2224f3 (patch) | |
| tree | f8d8b65e4dd49944f232607b8dcaf49560347963 | |
| parent | a350e3ef3899c012cd52a1130ffd5be9288f6f18 (diff) | |
Added guarding #ifndef/#define to avoid duplicate include of crypto/types.h
Fixes #14730
CLA: The author has the permission to grant the OpenSSL Team the right to use this change.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14729)
| -rw-r--r-- | include/crypto/types.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/crypto/types.h b/include/crypto/types.h index 13a5f9ce1d..0d81404091 100644 --- a/include/crypto/types.h +++ b/include/crypto/types.h @@ -9,15 +9,21 @@ /* When removal is simulated, we still need the type internally */ -#ifdef OPENSSL_NO_DEPRECATED_3_0 +#ifndef OSSL_CRYPTO_TYPES_H +# define OSSL_CRYPTO_TYPES_H +# pragma once + +# ifdef OPENSSL_NO_DEPRECATED_3_0 typedef struct rsa_st RSA; typedef struct rsa_meth_st RSA_METHOD; -# ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_EC typedef struct ec_key_st EC_KEY; typedef struct ec_key_method_st EC_KEY_METHOD; +# endif # endif -#endif -#ifndef OPENSSL_NO_EC +# ifndef OPENSSL_NO_EC typedef struct ecx_key_st ECX_KEY; +# endif + #endif |