summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/x509/x509_vfy.c
diff options
context:
space:
mode:
authorPaul Moore <pmoore2@cisco.com>2021-03-09 12:15:00 -0500
committerPeter Jones <pjones@redhat.com>2021-03-10 15:54:20 -0500
commitf5493df9c626a7436803d1e68b0118f4d041e0fa (patch)
treed2431ec75b3d566001f4563eac3d012fe058aaee /Cryptlib/OpenSSL/crypto/x509/x509_vfy.c
parentbbdfa72a0a5f8d5a8dd4a47e67195504a22ece5b (diff)
downloadefi-boot-shim-f5493df9c626a7436803d1e68b0118f4d041e0fa.tar.gz
efi-boot-shim-f5493df9c626a7436803d1e68b0118f4d041e0fa.zip
openssl: fix various build errors and warnings
There were a couple cases of "uninitialized variable" warnings in the imported OpenSSL code; I used the current OpenSSL code as a guide for picking the default values used here. On my dev system there is one remaining build warning in OpenSSL's crypto/asn1/x_pkey.c:X509_PKEY_new() function. Unfortunately it involves some preprocessor crimes and the fix would be a bit ugly. Fortunately it appears the warning here is harmless and can be ignored. As a point of reference, my build system is a current Arch install with GCC v10.2.0 and GNU-EFI v 3.0.12. Signed-off-by: Paul Moore <pmoore2@cisco.com>
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/x509/x509_vfy.c')
-rw-r--r--Cryptlib/OpenSSL/crypto/x509/x509_vfy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Cryptlib/OpenSSL/crypto/x509/x509_vfy.c b/Cryptlib/OpenSSL/crypto/x509/x509_vfy.c
index 5bf3f07a..96f306b2 100644
--- a/Cryptlib/OpenSSL/crypto/x509/x509_vfy.c
+++ b/Cryptlib/OpenSSL/crypto/x509/x509_vfy.c
@@ -984,7 +984,8 @@ static int check_cert(X509_STORE_CTX *ctx)
{
X509_CRL *crl = NULL, *dcrl = NULL;
X509 *x;
- int ok, cnum;
+ int ok = 0; /* current openssl sets 'ok' to zero here */
+ int cnum;
unsigned int last_reasons;
cnum = ctx->error_depth;
x = sk_X509_value(ctx->chain, cnum);