rpm/tboot
SHA256
1
0
Fork 0
forked from pool/tboot
Code Pull Requests Activity

Accepting request 540233 from home:mgerstner:branches:security

Browse Source 
- tboot-openssl-1-1-0.patch: make package compatible with OpenSSL 1.1.0.
  There's no upstream release containing this patch yet. The patch builds
  against OpenSSL 1.0.x as well. This is for SLE-15 support (bnc#1067229).

OBS-URL: https://build.opensuse.org/request/show/540233
OBS-URL: https://build.opensuse.org/package/show/security/tboot?expand=0&rev=67
This commit is contained in:
Matthias Gerstner 2017-11-09 14:20:14 +00:00 committed by Git OBS Bridge
parent a7886ebb39
commit f2d987fcbc
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tboot-openssl-1-1-0.patch Normal file
View File

@ -0,0 +1,32 @@
changeset: 503:2bb331ec268d
user: Ning Sun <ning.sun@intel.com>
date: Mon Aug 28 02:10:28 2017 -0700
summary: port to openssl-1.1.0
diff -r e57efe410a90 -r 2bb331ec268d lcptools/hash.c
--- a/lcptools/hash.c Mon Jul 24 05:34:17 2017 -0700
+++ b/lcptools/hash.c Mon Aug 28 02:10:28 2017 -0700
@@ -74,13 +74,18 @@
return false;
if ( hash_alg == TB_HALG_SHA1_LG ) {
- EVP_MD_CTX ctx;
+ EVP_MD_CTX *ctx = EVP_MD_CTX_create();
+ if (ctx == NULL) {
+ fprintf(stderr, "%s(): EVP_MD_CTX_create() failed.\n", __func__);
+ return false;
+ }
const EVP_MD *md;
md = EVP_sha1();
- EVP_DigestInit(&ctx, md);
- EVP_DigestUpdate(&ctx, buf, size);
- EVP_DigestFinal(&ctx, hash->sha1, NULL);
+ EVP_DigestInit(ctx, md);
+ EVP_DigestUpdate(ctx, buf, size);
+ EVP_DigestFinal(ctx, hash->sha1, NULL);
+ EVP_MD_CTX_destroy(ctx);
return true;
}
else

7
tboot.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Nov 9 14:08:59 UTC 2017 - matthias.gerstner@suse.com
- tboot-openssl-1-1-0.patch: make package compatible with OpenSSL 1.1.0.
There's no upstream release containing this patch yet. The patch builds
against OpenSSL 1.0.x as well. This is for SLE-15 support (bnc#1067229).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 18 11:10:29 UTC 2017 - matthias.gerstner@suse.com Tue Jul 18 11:10:29 UTC 2017 - matthias.gerstner@suse.com

2
tboot.spec
View File

@ -27,6 +27,7 @@ Url: http://sourceforge.net/projects/tboot/
Source0: http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz Source0: http://downloads.sourceforge.net/project/tboot/tboot/tboot-%{ver}.tar.gz
Patch3: tboot-grub2-fix-menu-in-xen-host-server.patch Patch3: tboot-grub2-fix-menu-in-xen-host-server.patch
Patch4: tboot-grub2-fix-xen-submenu-name.patch Patch4: tboot-grub2-fix-xen-submenu-name.patch
Patch5: tboot-openssl-1-1-0.patch
# PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/tboot/code/merge-requests/1/ # PATCH-FIX-UPSTREAM -- https://sourceforge.net/p/tboot/code/merge-requests/1/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: openssl-devel BuildRequires: openssl-devel
@ -42,6 +43,7 @@ verified launch of an OS kernel/VMM.
%setup -q -n %name-%ver %setup -q -n %name-%ver
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"