31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
From 9bd2926c0f359f143141c32c2b261ca100d804c8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Witschel <diabonas@archlinux.org>
|
||
|
|
Date: Wed, 13 May 2020 10:56:03 +0200
|
||
|
|
Subject: [PATCH] Remove unused global variable to fix compilation with GCC 10
|
||
|
|
|
||
|
|
GCC defaults to -fno-common, resulting in a compilation error:
|
||
|
|
|
||
|
|
CryptSym.h:84: multiple definition of `tpmCryptKeySchedule'
|
||
|
|
|
||
|
|
Since the global variable is not used anywhere, it can be removed.
|
||
|
|
[Retrieved from:
|
||
|
|
https://github.com/kgoldman/ibmswtpm2/pull/3/commits/9bd2926c0f359f143141c32c2b261ca100d804c8]
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
---
|
||
|
|
src/CryptSym.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/CryptSym.h b/src/CryptSym.h
|
||
|
|
index 7b58e41..9a33b13 100644
|
||
|
|
--- a/src/CryptSym.h
|
||
|
|
+++ b/src/CryptSym.h
|
||
|
|
@@ -81,7 +81,7 @@ union tpmCryptKeySchedule_t {
|
||
|
|
#else
|
||
|
|
uint32_t alignment;
|
||
|
|
#endif
|
||
|
|
-} tpmCryptKeySchedule;
|
||
|
|
+};
|
||
|
|
/* Each block cipher within a library is expected to conform to the same calling conventions with
|
||
|
|
three parameters (keySchedule, in, and out) in the same order. That means that all algorithms
|
||
|
|
would use the same order of the same parameters. The code is written assuming the (keySchedule,
|