!39 为openssl源码中bio.h文件添加FILE变量定义
From: @ZhouShuiQing Reviewed-by: @hzero1996 Signed-off-by: @hzero1996
This commit is contained in:
commit
037ebfbfe2
33
0003-add-definition-for-FILE-variable.patch
Normal file
33
0003-add-definition-for-FILE-variable.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 266e1366a71c0e2cd3c96a747508fbd42c446b13 Mon Sep 17 00:00:00 2001
|
||||
From: zhoushuiqing <zhoushuiqing2@huawei.com>
|
||||
Date: Thu, 10 Aug 2023 15:21:14 +0800
|
||||
Subject: [PATCH] Add a definition for FILE variable
|
||||
|
||||
Add the definition of the FILE variable to the bio.h header file of OpenSSL.
|
||||
|
||||
---
|
||||
openssl_source/openssl-1.1.1t/include/openssl/bio.h | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/openssl_source/openssl-1.1.1t/include/openssl/bio.h b/openssl_source/openssl-1.1.1t/include/openssl/bio.h
|
||||
index ae559a5..514e107 100644
|
||||
--- a/openssl_source/openssl-1.1.1t/include/openssl/bio.h
|
||||
+++ b/openssl_source/openssl-1.1.1t/include/openssl/bio.h
|
||||
@@ -14,6 +14,14 @@
|
||||
|
||||
# ifndef OPENSSL_NO_STDIO
|
||||
# include <stdio.h>
|
||||
+
|
||||
+#ifndef __FILE_defined
|
||||
+#define __FILE_defined 1
|
||||
+struct _IO_FILE;
|
||||
+/* The opaque type of streams. This is the definition used elsewhere. */
|
||||
+typedef struct _IO_FILE FILE;
|
||||
+#endif
|
||||
+
|
||||
# endif
|
||||
# include <stdarg.h>
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
%define openssl_version 1.1.1t
|
||||
Name: intel-sgx-ssl
|
||||
Version: 2.19
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Intel® Software Guard Extensions SSL
|
||||
ExclusiveArch: x86_64
|
||||
License: OpenSSL and BSD-3-Clause
|
||||
@ -11,6 +11,7 @@ Source1: https://www.openssl.org/source/old/1.1.1/openssl-%{openssl_versi
|
||||
|
||||
Patch0: 0001-Solution_to_issue_ssl_library_is_not_supported.patch
|
||||
Patch1: 0002-adapt-openssl-CVE.patch
|
||||
Patch2: 0003-add-definition-for-FILE-variable.patch
|
||||
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: libsgx-launch libsgx-urts sgxsdk perl
|
||||
@ -44,6 +45,7 @@ Requires: %{name} = %{version}-%{release}
|
||||
%setup -q -D -T -n intel-sgx-ssl-lin_%{version}_%{openssl_version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
cp %{SOURCE1} openssl_source/
|
||||
@ -65,6 +67,9 @@ cp License.txt $RPM_BUILD_ROOT/opt/intel/sgxssl/docs/
|
||||
/opt/intel/sgxssl/include/*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 10 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-2
|
||||
- Add definition for FILE variable
|
||||
|
||||
* Fri Jul 21 2023 zhoushuiqing <zhoushuiqing2@huawei.com> - 2.19-1
|
||||
- Upgrade to 2.19
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user