Skip to content

Commit

Permalink
Merge pull request wolfSSL#8022 from douzzer/20240927-fixes
Browse files Browse the repository at this point in the history 
20240927-fixes
  • Loading branch information
@JacobBarthelmeh
JacobBarthelmeh authored Sep 27, 2024
2 parents dd2186f + 794f0d8 commit 3178ce6
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 32 deletions.
19 changes: 14 additions & 5 deletions src/bio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,7 @@ size_t wolfSSL_BIO_ctrl_pending(WOLFSSL_BIO *bio)
long wolfSSL_BIO_get_mem_ptr(WOLFSSL_BIO *bio, WOLFSSL_BUF_MEM **ptr)
{
WOLFSSL_BIO* front = bio;
long ret = WOLFSSL_FAILURE;
long ret = WC_NO_ERR_TRACE(WOLFSSL_FAILURE);

WOLFSSL_ENTER("wolfSSL_BIO_get_mem_ptr");

Expand All @@ -1358,7 +1358,10 @@ long wolfSSL_BIO_get_mem_ptr(WOLFSSL_BIO *bio, WOLFSSL_BUF_MEM **ptr)
bio = bio->prev;
}

return ret;
if (ret == WOLFSSL_SUCCESS)
return ret;
else
return WOLFSSL_FAILURE;
}

#ifdef OPENSSL_ALL
Expand Down Expand Up @@ -2231,7 +2234,10 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
ret = WOLFSSL_SUCCESS;
}

return ret;
if (ret == WOLFSSL_SUCCESS)
return ret;
else
return WOLFSSL_FAILURE;
}

WOLFSSL_BIO_METHOD* wolfSSL_BIO_f_buffer(void)
Expand Down Expand Up @@ -2600,7 +2606,7 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)

long wolfSSL_BIO_set_ssl(WOLFSSL_BIO* b, WOLFSSL* ssl, int closeF)
{
long ret = WOLFSSL_FAILURE;
long ret = WC_NO_ERR_TRACE(WOLFSSL_FAILURE);

WOLFSSL_ENTER("wolfSSL_BIO_set_ssl");

Expand All @@ -2613,7 +2619,10 @@ int wolfSSL_BIO_flush(WOLFSSL_BIO* bio)
ret = WOLFSSL_SUCCESS;
}

return ret;
if (ret == WOLFSSL_SUCCESS)
return ret;
else
return WOLFSSL_FAILURE;
}

long wolfSSL_BIO_get_ssl(WOLFSSL_BIO* bio, WOLFSSL** ssl)
Expand Down
1 change: 1 addition & 0 deletions src/pk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8792,6 +8792,7 @@ static int _DH_compute_key(unsigned char* key, const WOLFSSL_BIGNUM* otherPub,
XMEMMOVE(key, key + (padded_keySz - keySz),
padded_keySz - keySz);
XMEMSET(key, 0, padded_keySz - keySz);
keySz = padded_keySz;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ssl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11447,7 +11447,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
WOLFSSL_BIO* bio = NULL;
WOLFSSL_X509 *cert = NULL;
WOLFSSL_X509_NAME *nameCopy = NULL;
unsigned long err = WOLFSSL_FAILURE;
unsigned long err = WC_NO_ERR_TRACE(WOLFSSL_FAILURE);

WOLFSSL_ENTER("wolfSSL_load_client_CA_file");

Expand Down
80 changes: 54 additions & 26 deletions wolfcrypt/src/wc_kyber_poly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1236,8 +1236,9 @@ void kyber_keygen(sword16* priv, sword16* pub, sword16* e, const sword16* a,
int kp)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if ((IS_INTEL_AVX2(cpuid_flags)) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_keygen_avx2(priv, pub, e, a, kp);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -1314,8 +1315,9 @@ void kyber_encapsulate(const sword16* pub, sword16* bp, sword16* v,
const sword16* m, int kp)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_encapsulate_avx2(pub, bp, v, at, sp, ep, epp, m, kp);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -1365,8 +1367,9 @@ void kyber_decapsulate(const sword16* priv, sword16* mp, sword16* bp,
const sword16* v, int kp)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_decapsulate_avx2(priv, mp, bp, v, kp);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -1569,8 +1572,9 @@ static int kyber_gen_matrix_k3_avx2(sword16* a, byte* seed, int transposed)
if (IS_INTEL_BMI2(cpuid_flags)) {
sha3_block_bmi2(state);
}
else if (IS_INTEL_AVX2(cpuid_flags)) {
else if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
sha3_block_avx2(state);
RESTORE_VECTOR_REGISTERS();
}
else {
BlockSha3(state);
Expand All @@ -1582,8 +1586,9 @@ static int kyber_gen_matrix_k3_avx2(sword16* a, byte* seed, int transposed)
if (IS_INTEL_BMI2(cpuid_flags)) {
sha3_block_bmi2(state);
}
else if (IS_INTEL_AVX2(cpuid_flags)) {
else if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
sha3_block_avx2(state);
RESTORE_VECTOR_REGISTERS();
}
else {
BlockSha3(state);
Expand Down Expand Up @@ -2058,8 +2063,9 @@ static int kyber_prf(wc_Shake* shake256, byte* out, unsigned int outLen,
if (IS_INTEL_BMI2(cpuid_flags)) {
sha3_block_bmi2(state);
}
else if (IS_INTEL_AVX2(cpuid_flags)) {
else if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
sha3_block_avx2(state);
RESTORE_VECTOR_REGISTERS();
}
else {
BlockSha3(state);
Expand Down Expand Up @@ -2105,8 +2111,9 @@ int kyber_kdf(byte* seed, int seedLen, byte* out, int outLen)
if (IS_INTEL_BMI2(cpuid_flags)) {
sha3_block_bmi2(state);
}
else if (IS_INTEL_AVX2(cpuid_flags)) {
else if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
sha3_block_avx2(state);
RESTORE_VECTOR_REGISTERS();
}
else {
BlockSha3(state);
Expand Down Expand Up @@ -2376,8 +2383,9 @@ int kyber_gen_matrix(KYBER_PRF_T* prf, sword16* a, int kp, byte* seed,
ret = kyber_gen_matrix_k2_aarch64(a, seed, transposed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_gen_matrix_k2_avx2(a, seed, transposed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand All @@ -2394,8 +2402,9 @@ int kyber_gen_matrix(KYBER_PRF_T* prf, sword16* a, int kp, byte* seed,
ret = kyber_gen_matrix_k3_aarch64(a, seed, transposed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_gen_matrix_k3_avx2(a, seed, transposed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand All @@ -2412,8 +2421,9 @@ int kyber_gen_matrix(KYBER_PRF_T* prf, sword16* a, int kp, byte* seed,
ret = kyber_gen_matrix_k4_aarch64(a, seed, transposed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_gen_matrix_k4_avx2(a, seed, transposed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3213,8 +3223,9 @@ int kyber_get_noise(KYBER_PRF_T* prf, int kp, sword16* vec1,
ret = kyber_get_noise_k2_aarch64(vec1, vec2, poly, seed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_get_noise_k2_avx2(prf, vec1, vec2, poly, seed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand All @@ -3236,8 +3247,9 @@ int kyber_get_noise(KYBER_PRF_T* prf, int kp, sword16* vec1,
ret = kyber_get_noise_k3_aarch64(vec1, vec2, poly, seed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_get_noise_k3_avx2(vec1, vec2, poly, seed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand All @@ -3255,8 +3267,9 @@ int kyber_get_noise(KYBER_PRF_T* prf, int kp, sword16* vec1,
ret = kyber_get_noise_k4_aarch64(vec1, vec2, poly, seed);
#else
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
ret = kyber_get_noise_k4_avx2(prf, vec1, vec2, poly, seed);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3317,8 +3330,9 @@ int kyber_cmp(const byte* a, const byte* b, int sz)
int fail;

#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
fail = kyber_cmp_avx2(a, b, sz);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3555,8 +3569,9 @@ static void kyber_vec_compress_10_c(byte* r, sword16* v, unsigned int kp)
void kyber_vec_compress_10(byte* r, sword16* v, unsigned int kp)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_compress_10_avx2(r, v, kp);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3648,8 +3663,9 @@ static void kyber_vec_compress_11_c(byte* r, sword16* v)
void kyber_vec_compress_11(byte* r, sword16* v)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_compress_11_avx2(r, v, 4);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3746,8 +3762,9 @@ void kyber_vec_decompress_10(sword16* v, const unsigned char* b,
unsigned int kp)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_decompress_10_avx2(v, b, kp);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3829,8 +3846,9 @@ static void kyber_vec_decompress_11_c(sword16* v, const unsigned char* b)
void kyber_vec_decompress_11(sword16* v, const unsigned char* b)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_decompress_11_avx2(v, b, 4);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -3979,8 +3997,9 @@ static void kyber_compress_4_c(byte* b, sword16* p)
void kyber_compress_4(byte* b, sword16* p)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_compress_4_avx2(b, p);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4052,8 +4071,9 @@ static void kyber_compress_5_c(byte* b, sword16* p)
void kyber_compress_5(byte* b, sword16* p)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_compress_5_avx2(b, p);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4112,8 +4132,9 @@ static void kyber_decompress_4_c(sword16* p, const unsigned char* b)
void kyber_decompress_4(sword16* p, const unsigned char* b)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_decompress_4_avx2(p, b);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4186,8 +4207,9 @@ static void kyber_decompress_5_c(sword16* p, const unsigned char* b)
void kyber_decompress_5(sword16* p, const unsigned char* b)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_decompress_5_avx2(p, b);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4253,8 +4275,9 @@ static void kyber_from_msg_c(sword16* p, const byte* msg)
void kyber_from_msg(sword16* p, const byte* msg)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
kyber_from_msg_avx2(p, msg);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4342,9 +4365,10 @@ static void kyber_to_msg_c(byte* msg, sword16* p)
void kyber_to_msg(byte* msg, sword16* p)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
/* Convert the polynomial into a array of bytes (message). */
kyber_to_msg_avx2(msg, p);
RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4414,14 +4438,16 @@ static void kyber_from_bytes_c(sword16* p, const byte* b, int k)
void kyber_from_bytes(sword16* p, const byte* b, int k)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
int i;

for (i = 0; i < k; i++) {
kyber_from_bytes_avx2(p, b);
p += KYBER_N;
b += KYBER_POLY_SIZE;
}

RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down Expand Up @@ -4473,14 +4499,16 @@ static void kyber_to_bytes_c(byte* b, sword16* p, int k)
void kyber_to_bytes(byte* b, sword16* p, int k)
{
#ifdef USE_INTEL_SPEEDUP
if (IS_INTEL_AVX2(cpuid_flags)) {
if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
int i;

for (i = 0; i < k; i++) {
kyber_to_bytes_avx2(b, p);
p += KYBER_N;
b += KYBER_POLY_SIZE;
}

RESTORE_VECTOR_REGISTERS();
}
else
#endif
Expand Down

0 comments on commit 3178ce6

Please sign in to comment.