vboot-utils: fix RSA redefinition build error with old compilers

Old gcc compilers do not support type redefinitions, which causes a
build failure of the host-vboot-utils package on certain machines. The
vboot-utils source code redefines "typedef struct rsa_st RSA" which is
already defined in the OpenSSL headers.

This commit adds a patch which works around this build issue.

Fixes:

  http://autobuild.buildroot.org/results/1a4/1a45412939a3f9d6fa59d086d834a3b4a4bffef7/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2016-01-21 22:10:10 +01:00
parent d6ac6942f9
commit 530c5a5595

View File

@ -0,0 +1,44 @@
From 593407d2b3ea3b871d55ec399671e48c84b900a7 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 21 Jan 2016 22:01:37 +0100
Subject: [PATCH] Avoid RSA type redefinition
The host_key.h headers does:
typedef struct rsa_st RSA;
But this type definition is already done by the OpenSSL headers.
While such a type redefinition is legal with recent gcc versions, it
doesn't build with older gcc versions such as gcc 4.4.
To work around this problem, we instead use a forward declaration of
"struct rsa_st", and change the only place where the RSA type was used
by "struct rsa_st".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
host/lib/include/host_key.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/host/lib/include/host_key.h b/host/lib/include/host_key.h
index 9f98ccc..c2d01a5 100644
--- a/host/lib/include/host_key.h
+++ b/host/lib/include/host_key.h
@@ -12,11 +12,11 @@
#include "vboot_struct.h"
-typedef struct rsa_st RSA;
+struct rsa_st;
/* Private key data */
typedef struct VbPrivateKey {
- RSA* rsa_private_key; /* Private key data */
+ struct rsa_rt* rsa_private_key; /* Private key data */
uint64_t algorithm; /* Algorithm to use when signing */
} VbPrivateKey;
--
2.6.4