mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-31 19:24:42 +02:00
Merge pull request #4244 from SparkiDev/config_fix_4
Configuration: fixes for uncommon configurations
This commit is contained in:
@@ -31903,7 +31903,7 @@ int wolfSSL_DSA_do_verify_ex(const unsigned char* digest, int digest_len,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
key = dsa->internal;
|
key = (DsaKey*)dsa->internal;
|
||||||
|
|
||||||
if (key == NULL) {
|
if (key == NULL) {
|
||||||
WOLFSSL_MSG("dsa->internal is null");
|
WOLFSSL_MSG("dsa->internal is null");
|
||||||
@@ -56994,7 +56994,7 @@ WOLF_STACK_OF(WOLFSSL_X509_OBJECT)* wolfSSL_X509_STORE_get0_objects(
|
|||||||
goto err_cleanup;
|
goto err_cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WOLFSSL_SIGNER_DER_CERT
|
#if defined(WOLFSSL_SIGNER_DER_CERT) && !defined(NO_FILESYSTEM)
|
||||||
cert_stack = wolfSSL_CertManagerGetCerts(store->cm);
|
cert_stack = wolfSSL_CertManagerGetCerts(store->cm);
|
||||||
/* wolfSSL_sk_X509_pop checks for NULL */
|
/* wolfSSL_sk_X509_pop checks for NULL */
|
||||||
while ((x509 = wolfSSL_sk_X509_pop(cert_stack)) != NULL) {
|
while ((x509 = wolfSSL_sk_X509_pop(cert_stack)) != NULL) {
|
||||||
|
@@ -8048,6 +8048,11 @@ static void AesGcmFinal_C(Aes* aes, byte* authTag, word32 authTagSz)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WOLFSSL_AESNI
|
#ifdef WOLFSSL_AESNI
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Assembly code implementations in: aes_gcm_asm.S */
|
/* Assembly code implementations in: aes_gcm_asm.S */
|
||||||
#ifdef HAVE_INTEL_AVX2
|
#ifdef HAVE_INTEL_AVX2
|
||||||
extern void AES_GCM_init_avx2(const unsigned char* key, int nr,
|
extern void AES_GCM_init_avx2(const unsigned char* key, int nr,
|
||||||
@@ -8102,6 +8107,10 @@ extern void AES_GCM_encrypt_final_aesni(unsigned char* tag,
|
|||||||
unsigned char* authTag, unsigned int tbytes, unsigned int nbytes,
|
unsigned char* authTag, unsigned int tbytes, unsigned int nbytes,
|
||||||
unsigned int abytes, unsigned char* h, unsigned char* initCtr);
|
unsigned int abytes, unsigned char* h, unsigned char* initCtr);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Initialize the AES GCM cipher with an IV. AES-NI implementations.
|
/* Initialize the AES GCM cipher with an IV. AES-NI implementations.
|
||||||
*
|
*
|
||||||
* @param [in, out] aes AES object.
|
* @param [in, out] aes AES object.
|
||||||
@@ -8450,6 +8459,11 @@ static void AesGcmEncryptFinal_aesni(Aes* aes, byte* authTag, word32 authTagSz)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(HAVE_AES_DECRYPT) || defined(HAVE_AESGCM_DECRYPT)
|
#if defined(HAVE_AES_DECRYPT) || defined(HAVE_AESGCM_DECRYPT)
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Assembly code implementations in: aes_gcm_asm.S */
|
/* Assembly code implementations in: aes_gcm_asm.S */
|
||||||
#ifdef HAVE_INTEL_AVX2
|
#ifdef HAVE_INTEL_AVX2
|
||||||
extern void AES_GCM_decrypt_update_avx2(const unsigned char* key, int nr,
|
extern void AES_GCM_decrypt_update_avx2(const unsigned char* key, int nr,
|
||||||
@@ -8474,6 +8488,10 @@ extern void AES_GCM_decrypt_final_aesni(unsigned char* tag,
|
|||||||
const unsigned char* authTag, unsigned int tbytes, unsigned int nbytes,
|
const unsigned char* authTag, unsigned int tbytes, unsigned int nbytes,
|
||||||
unsigned int abytes, unsigned char* h, unsigned char* initCtr, int* res);
|
unsigned int abytes, unsigned char* h, unsigned char* initCtr, int* res);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Update the AES GCM for decryption with data and/or authentication data.
|
/* Update the AES GCM for decryption with data and/or authentication data.
|
||||||
*
|
*
|
||||||
* @param [in, out] aes AES object.
|
* @param [in, out] aes AES object.
|
||||||
|
Reference in New Issue
Block a user