From e70dfe7265fe2be13b61a60d23024f97f1b18082 Mon Sep 17 00:00:00 2001
From: Juliusz Sosinowicz <juliusz@wolfssl.com>
Date: Mon, 18 Oct 2021 18:29:07 +0200
Subject: [PATCH] #239

---
 wolfssl/openssl/compat_types.h | 21 +++++++++++++++++++++
 wolfssl/openssl/evp.h          | 28 ++--------------------------
 wolfssl/openssl/hmac.h         |  1 -
 wolfssl/ssl.h                  |  9 +--------
 4 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/wolfssl/openssl/compat_types.h b/wolfssl/openssl/compat_types.h
index 8d80cebbd..52764cf1a 100644
--- a/wolfssl/openssl/compat_types.h
+++ b/wolfssl/openssl/compat_types.h
@@ -37,4 +37,25 @@ typedef struct WOLFSSL_HMAC_CTX {
     word32  save_opad[WC_HMAC_BLOCK_SIZE  / sizeof(word32)];
 } WOLFSSL_HMAC_CTX;
 
+typedef char   WOLFSSL_EVP_MD;
+typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_EVP_PKEY;
+typedef struct WOLFSSL_EVP_MD_CTX   WOLFSSL_EVP_MD_CTX;
+typedef struct WOLFSSL_EVP_PKEY WOLFSSL_PKCS8_PRIV_KEY_INFO;
+typedef char WOLFSSL_EVP_CIPHER;
+typedef struct WOLFSSL_EVP_PKEY_CTX WOLFSSL_EVP_PKEY_CTX;
+typedef struct WOLFSSL_EVP_CIPHER_CTX WOLFSSL_EVP_CIPHER_CTX;
+typedef struct WOLFSSL_ASN1_PCTX WOLFSSL_ASN1_PCTX;
+
+typedef WOLFSSL_EVP_MD         EVP_MD;
+typedef WOLFSSL_EVP_MD_CTX     EVP_MD_CTX;
+typedef WOLFSSL_EVP_CIPHER     EVP_CIPHER;
+typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
+typedef WOLFSSL_ASN1_PCTX      ASN1_PCTX;
+typedef WOLFSSL_EVP_PKEY       EVP_PKEY;
+typedef WOLFSSL_EVP_PKEY       PKCS8_PRIV_KEY_INFO;
+
+typedef int WOLFSSL_ENGINE;
+typedef WOLFSSL_ENGINE ENGINE;
+typedef WOLFSSL_EVP_PKEY_CTX EVP_PKEY_CTX;
+
 #endif /* WOLFSSL_OPENSSL_COMPAT_TYPES_H_ */
diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h
index 9b296badd..2a2e7ed7a 100644
--- a/wolfssl/openssl/evp.h
+++ b/wolfssl/openssl/evp.h
@@ -49,6 +49,7 @@
 #include <wolfssl/openssl/dsa.h>
 #include <wolfssl/openssl/ec.h>
 #include <wolfssl/openssl/dh.h>
+#include <wolfssl/openssl/compat_types.h>
 
 #include <wolfssl/wolfcrypt/aes.h>
 #include <wolfssl/wolfcrypt/des3.h>
@@ -68,18 +69,6 @@
 #endif
 
 
-typedef char WOLFSSL_EVP_CIPHER;
-#ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */
-typedef char   WOLFSSL_EVP_MD;
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_EVP_PKEY;
-typedef struct WOLFSSL_EVP_MD_CTX   WOLFSSL_EVP_MD_CTX;
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_PKCS8_PRIV_KEY_INFO;
-#define WOLFSSL_EVP_TYPE_DEFINED
-#endif
-
-typedef WOLFSSL_EVP_PKEY       EVP_PKEY;
-typedef WOLFSSL_EVP_PKEY       PKCS8_PRIV_KEY_INFO;
-
 #ifndef NO_MD4
     WOLFSSL_API const WOLFSSL_EVP_MD* wolfSSL_EVP_md4(void);
 #endif
@@ -185,8 +174,6 @@ typedef union {
     #endif
 } WOLFSSL_Hasher;
 
-typedef struct WOLFSSL_EVP_PKEY_CTX WOLFSSL_EVP_PKEY_CTX;
-typedef struct WOLFSSL_EVP_CIPHER_CTX WOLFSSL_EVP_CIPHER_CTX;
 
 struct WOLFSSL_EVP_MD_CTX {
     union {
@@ -417,10 +404,9 @@ struct WOLFSSL_EVP_PKEY_CTX {
     int nbits;
 };
 
-typedef
 struct WOLFSSL_ASN1_PCTX {
     int dummy;
-} WOLFSSL_ASN1_PCTX;
+};
 #if defined(WOLFSSL_BASE64_ENCODE) || defined(WOLFSSL_BASE64_DECODE)
 
 #define   BASE64_ENCODE_BLOCK_SIZE  48
@@ -457,10 +443,6 @@ WOLFSSL_API int wolfSSL_EVP_DecodeFinal(WOLFSSL_EVP_ENCODE_CTX* ctx,
 WOLFSSL_API const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2b512(void);
 WOLFSSL_API const WOLFSSL_EVP_MD* wolfSSL_EVP_blake2s256(void);
 
-typedef int WOLFSSL_ENGINE  ;
-typedef WOLFSSL_ENGINE ENGINE;
-typedef WOLFSSL_EVP_PKEY_CTX EVP_PKEY_CTX;
-
 #define EVP_PKEY_OP_SIGN    (1 << 3)
 #define EVP_PKEY_OP_ENCRYPT (1 << 6)
 #define EVP_PKEY_OP_DECRYPT (1 << 7)
@@ -773,12 +755,6 @@ WOLFSSL_API void wolfSSL_EVP_MD_do_all(void (*fn) (const WOLFSSL_EVP_MD *md,
 
 /* end OpenSSH compat */
 
-typedef WOLFSSL_EVP_MD         EVP_MD;
-typedef WOLFSSL_EVP_CIPHER     EVP_CIPHER;
-typedef WOLFSSL_EVP_MD_CTX     EVP_MD_CTX;
-typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
-typedef WOLFSSL_ASN1_PCTX      ASN1_PCTX;
-
 #ifndef NO_MD4
     #define EVP_md4       wolfSSL_EVP_md4
 #endif
diff --git a/wolfssl/openssl/hmac.h b/wolfssl/openssl/hmac.h
index 9551fc1da..a7fa373e2 100644
--- a/wolfssl/openssl/hmac.h
+++ b/wolfssl/openssl/hmac.h
@@ -36,7 +36,6 @@
 #endif
 
 #include <wolfssl/openssl/compat_types.h>
-#include <wolfssl/openssl/evp.h>
 #include <wolfssl/openssl/opensslv.h>
 
 #ifdef __cplusplus
diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h
index 506dfc0bf..26114f070 100644
--- a/wolfssl/ssl.h
+++ b/wolfssl/ssl.h
@@ -90,6 +90,7 @@
     #include <wolfssl/openssl/compat_types.h>
     #include <wolfssl/openssl/bn.h>
     #include <wolfssl/openssl/hmac.h>
+    #include <wolfssl/openssl/rsa.h>
 
     /* We need the old SSL names */
     #ifdef NO_OLD_SSL_NAMES
@@ -413,14 +414,6 @@ struct WOLFSSL_EVP_PKEY {
     byte ownRsa:1; /* if struct owns RSA and should free it */
 };
 
-#ifndef WOLFSSL_EVP_TYPE_DEFINED /* guard on redeclaration */
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_EVP_PKEY;
-typedef struct WOLFSSL_EVP_MD_CTX   WOLFSSL_EVP_MD_CTX;
-typedef struct WOLFSSL_EVP_PKEY     WOLFSSL_PKCS8_PRIV_KEY_INFO;
-typedef char   WOLFSSL_EVP_MD;
-#define WOLFSSL_EVP_TYPE_DEFINED
-#endif
-
 struct WOLFSSL_X509_PKEY {
     WOLFSSL_EVP_PKEY* dec_pkey; /* dereferenced by Apache */
     void* heap;