From ff5506faf225009b487afe3ac6e3f507f75e8ac2 Mon Sep 17 00:00:00 2001
From: Go Hosohara <go@wolfssl.com>
Date: Wed, 19 Sep 2018 15:05:09 +0900
Subject: [PATCH] define wolfSSL_OPENSSL_add_all_alogrithms_noconf alias for
 wolfSSL_OpenSSL_add_all_algorithms_noconf and some fixes

---
 src/ssl.c             | 1 -
 wolfcrypt/src/asn.c   | 4 ----
 wolfssl/openssl/evp.h | 1 +
 wolfssl/openssl/pem.h | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ssl.c b/src/ssl.c
index b40b8349c..fc03b4c0a 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -29572,7 +29572,6 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
 
         return x509;
     }
-#include "stdio.h"
 
 #if defined(HAVE_CRL) && !defined(NO_FILESYSTEM)
     static void* wolfSSL_PEM_read_X509_ex(XFILE fp, void **x,
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 3ccc707e3..272850d5c 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -2933,8 +2933,6 @@ int UnTraditionalEnc(byte* key, word32 keySz, byte* out, word32* outSz,
     (void)rng;
 
     return totalSz + sz;
-    
-    (void)rng;
 }
 
 
@@ -3285,8 +3283,6 @@ int EncryptContent(byte* input, word32 inputSz, byte* out, word32* outSz,
     (void)rng;
 
     return totalSz;
-
-    (void)rng;
 }
 
 
diff --git a/wolfssl/openssl/evp.h b/wolfssl/openssl/evp.h
index a8c60bc46..b72b80f35 100644
--- a/wolfssl/openssl/evp.h
+++ b/wolfssl/openssl/evp.h
@@ -586,6 +586,7 @@ typedef WOLFSSL_EVP_CIPHER_CTX EVP_CIPHER_CTX;
 #define OpenSSL_add_all_ciphers()  wolfCrypt_Init()
 #define OpenSSL_add_all_algorithms wolfSSL_add_all_algorithms
 #define OpenSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_algorithms_noconf
+#define wolfSSL_OPENSSL_add_all_algorithms_noconf wolfSSL_OpenSSL_add_all_algorithms_noconf
 
 #define PKCS5_PBKDF2_HMAC_SHA1     wolfSSL_PKCS5_PBKDF2_HMAC_SHA1
 
diff --git a/wolfssl/openssl/pem.h b/wolfssl/openssl/pem.h
index 820cfd05e..5e368ab85 100644
--- a/wolfssl/openssl/pem.h
+++ b/wolfssl/openssl/pem.h
@@ -131,7 +131,7 @@ int wolfSSL_PEM_write_bio_PrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EVP_PKEY* key,
 #if !defined(NO_FILESYSTEM)
 WOLFSSL_API
 WOLFSSL_EVP_PKEY *wolfSSL_PEM_read_PUBKEY(XFILE fp, EVP_PKEY **x,
-										  pem_password_cb *cb, void *u);
+                                          pem_password_cb *cb, void *u);
 WOLFSSL_API
 WOLFSSL_X509 *wolfSSL_PEM_read_X509(XFILE fp, WOLFSSL_X509 **x,
                                           pem_password_cb *cb, void *u);