wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4325 from SparkiDev/jenkins_fixes_3

Browse Source 
OpenSSL Extra builds: fixes from nightly builds failing
This commit is contained in:
David Garske
2021-08-23 09:30:15 -07:00
committed by GitHub
parent 206b4641e8 4bfd0443a7
commit 6ec28f508e
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/asn.c
View File

@ -16789,9 +16789,8 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
return ret;
}
#if defined(WOLFCRYPT_ONLY) || defined(NO_CERTS) \
|| (!defined(OPENSSL_EXTRA) && !defined(OPENSSL_EXTRA_X509_SMALL) \
&& !defined(GetCA))
#if !defined(OPENSSL_EXTRA) && !defined(OPENSSL_EXTRA_X509_SMALL) && \
!defined(GetCA)
/* from SSL proper, for locking can't do find here anymore.
* brought in from internal.h if built with compat layer.
* if defined(GetCA), it's a predefined macro and these prototypes
@ -16808,9 +16807,9 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
}
#endif
#endif /* WOLFCRYPT_ONLY || NO_CERTS || (!OPENSSL_EXTRA && !OPENSSL_EXTRA_X509_SMALL && !GetCA) */
#endif /* !OPENSSL_EXTRA && !OPENSSL_EXTRA_X509_SMALL && !GetCA */
#if defined(WOLFCRYPT_ONLY) || defined(NO_CERTS)
#if defined(WOLFCRYPT_ONLY)
/* dummy functions, not using wolfSSL so don't need actual ones */
Signer* GetCA(void* signers, byte* hash)
@ -16829,7 +16828,7 @@ Signer* GetCAByName(void* signers, byte* hash)
}
#endif /* NO_SKID */
#endif /* WOLFCRYPT_ONLY || NO_CERTS */
#endif /* WOLFCRYPT_ONLY */
#if defined(WOLFSSL_NO_TRUSTED_CERTS_VERIFY) && !defined(NO_SKID)
static Signer* GetCABySubjectAndPubKey(DecodedCert* cert, void* cm)

5
wolfcrypt/src/evp.c
View File

@ -5693,7 +5693,8 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
return WOLFSSL_SUCCESS;
}
#if defined(HAVE_AESGCM)
#ifdef HAVE_WOLFSSL_EVP_CIPHER_CTX_IV
/* returns WOLFSSL_SUCCESS on success, otherwise returns WOLFSSL_FAILURE */
int wolfSSL_EVP_CIPHER_CTX_set_iv_length(WOLFSSL_EVP_CIPHER_CTX* ctx,
int ivLen)
@ -5706,7 +5707,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD* type)
return WOLFSSL_SUCCESS;
}
#endif
#if defined(HAVE_AESGCM)
/* returns WOLFSSL_SUCCESS on success, otherwise returns WOLFSSL_FAILURE */
int wolfSSL_EVP_CIPHER_CTX_set_iv(WOLFSSL_EVP_CIPHER_CTX* ctx, byte* iv,
int ivLen)