From 97ef5d09e9f0fc9d8f410fb031aa44e5d7f2263d Mon Sep 17 00:00:00 2001
From: Vic Lee <llyzs.vic@gmail.com>
Date: Fri, 8 Dec 2023 12:48:36 +0800
Subject: [PATCH] [core,crypto] fix missing OpenSSL includes.

---
 libfreerdp/crypto/cert_common.c | 1 +
 libfreerdp/crypto/certificate.c | 1 +
 libfreerdp/crypto/crypto.c      | 1 +
 libfreerdp/crypto/privatekey.c  | 1 +
 winpr/libwinpr/crypto/cipher.c  | 2 +-
 winpr/tools/makecert/makecert.c | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libfreerdp/crypto/cert_common.c b/libfreerdp/crypto/cert_common.c
index 1fe15848b..cfa40290c 100644
--- a/libfreerdp/crypto/cert_common.c
+++ b/libfreerdp/crypto/cert_common.c
@@ -36,6 +36,7 @@
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 
 #include "cert_common.h"
 #include "crypto.h"
diff --git a/libfreerdp/crypto/certificate.c b/libfreerdp/crypto/certificate.c
index ace266914..4f54f9dce 100644
--- a/libfreerdp/crypto/certificate.c
+++ b/libfreerdp/crypto/certificate.c
@@ -40,6 +40,7 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 
 #if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
 #include <openssl/core_names.h>
diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
index adb34bb13..9d99b9726 100644
--- a/libfreerdp/crypto/crypto.c
+++ b/libfreerdp/crypto/crypto.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 
 #include <openssl/objects.h>
+#include <openssl/bn.h>
 
 #include <freerdp/config.h>
 
diff --git a/libfreerdp/crypto/privatekey.c b/libfreerdp/crypto/privatekey.c
index 5b2084371..f05347e74 100644
--- a/libfreerdp/crypto/privatekey.c
+++ b/libfreerdp/crypto/privatekey.c
@@ -36,6 +36,7 @@
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
+#include <openssl/bn.h>
 
 #include "privatekey.h"
 #include "cert_common.h"
diff --git a/winpr/libwinpr/crypto/cipher.c b/winpr/libwinpr/crypto/cipher.c
index 311d53be5..98ade4b9a 100644
--- a/winpr/libwinpr/crypto/cipher.c
+++ b/winpr/libwinpr/crypto/cipher.c
@@ -93,7 +93,7 @@ static WINPR_RC4_CTX* winpr_RC4_New_Internal(const BYTE* key, size_t keylen, BOO
 	if (!evp)
 		goto fail;
 
-	EVP_CIPHER_CTX_init(ctx->ctx);
+	EVP_CIPHER_CTX_reset(ctx->ctx);
 	if (EVP_EncryptInit_ex(ctx->ctx, evp, NULL, NULL, NULL) != 1)
 		goto fail;
 
diff --git a/winpr/tools/makecert/makecert.c b/winpr/tools/makecert/makecert.c
index ac994a6cc..f1505a27d 100644
--- a/winpr/tools/makecert/makecert.c
+++ b/winpr/tools/makecert/makecert.c
@@ -36,6 +36,7 @@
 #include <openssl/rsa.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509v3.h>
+#include <openssl/bn.h>
 #endif
 
 #include <winpr/tools/makecert.h>