diff options
| author | Paul Moore <pmoore2@cisco.com> | 2021-03-09 12:15:00 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-10 15:54:20 -0500 |
| commit | f5493df9c626a7436803d1e68b0118f4d041e0fa (patch) | |
| tree | d2431ec75b3d566001f4563eac3d012fe058aaee /Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c | |
| parent | bbdfa72a0a5f8d5a8dd4a47e67195504a22ece5b (diff) | |
| download | efi-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/rsa/rsa_ameth.c')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c b/Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c index 951e1d5c..ddead3d7 100644 --- a/Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c +++ b/Cryptlib/OpenSSL/crypto/rsa/rsa_ameth.c @@ -768,6 +768,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn, return 2; } +#ifndef OPENSSL_NO_CMS static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg, X509_ALGOR **pmaskHash) { @@ -791,7 +792,6 @@ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg, return pss; } -#ifndef OPENSSL_NO_CMS static int rsa_cms_decrypt(CMS_RecipientInfo *ri) { EVP_PKEY_CTX *pkctx; |