summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2021-03-26 13:47:39 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-03-28 12:43:46 +1000
commita638fb9413b2fc3e5f9d1de3ff0dcc1ec6c78468 (patch)
tree2e5fcd230ae4d79bfb7e11ebe945b4d9b23faac7 /include/crypto
parented2e5b612d9b85b8b550a9231c3ae69be26e3d89 (diff)
Fix Build issue on Oracle Linux x64
'typedef struct ecx_key_st ECX_KEY' was defined multiple times. It is defined inside include/crypto/types.h which is included from include/crypto/ecx.h. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14693)
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/ecx.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/crypto/ecx.h b/include/crypto/ecx.h
index dfc70fb4e6..656ee94f09 100644
--- a/include/crypto/ecx.h
+++ b/include/crypto/ecx.h
@@ -76,8 +76,6 @@ struct ecx_key_st {
CRYPTO_RWLOCK *lock;
};
-typedef struct ecx_key_st ECX_KEY;
-
size_t ossl_ecx_key_length(ECX_KEY_TYPE type);
ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type,
int haspubkey, const char *propq);