[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  a638fb9413b2fc3e5f9d1de3ff0dcc1ec6c78468 (commit)
      from  ed2e5b612d9b85b8b550a9231c3ae69be26e3d89 (commit)


- Log -----------------------------------------------------------------
commit a638fb9413b2fc3e5f9d1de3ff0dcc1ec6c78468
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Fri Mar 26 13:47:39 2021 +1000

    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 at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14693)

-----------------------------------------------------------------------

Summary of changes:
 include/crypto/ecx.h | 2 --
 1 file changed, 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);