Skip to content

Commit 3465dde

Browse files
douzzerdouzzer
committed
synchronize with scripts#480 (except wolfcrypt/src/sp_arm32.c and wolfcrypt/src/sp_cortexm.c, which have large unrelated desyncs).
1 parent c401f5c commit 3465dde

51 files changed

Lines changed: 71 additions & 201 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎wolfcrypt/src/aes_gcm_asm.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
#define HAVE_INTEL_AVX1
4343
#endif /* HAVE_INTEL_AVX1 */
4444
#ifndef NO_AVX2_SUPPORT
45+
#ifndef HAVE_INTEL_AVX2
4546
#define HAVE_INTEL_AVX2
47+
#endif /* HAVE_INTEL_AVX2 */
4648
#endif /* NO_AVX2_SUPPORT */
4749

4850
#ifdef WOLFSSL_X86_64_BUILD

‎wolfcrypt/src/aes_gcm_x86_asm.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727
#define HAVE_INTEL_AVX1
2828
#endif /* HAVE_INTEL_AVX1 */
2929
#ifndef NO_AVX2_SUPPORT
30+
#ifndef HAVE_INTEL_AVX2
3031
#define HAVE_INTEL_AVX2
32+
#endif /* HAVE_INTEL_AVX2 */
3133
#endif /* NO_AVX2_SUPPORT */
3234

3335
.type data, @object

‎wolfcrypt/src/aes_xts_asm.S‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@
4141
#ifndef HAVE_INTEL_AVX1
4242
#define HAVE_INTEL_AVX1
4343
#endif /* HAVE_INTEL_AVX1 */
44-
#if !defined(NO_AVX2_SUPPORT) && !defined(HAVE_INTEL_AVX2)
44+
#ifndef NO_AVX2_SUPPORT
45+
#ifndef HAVE_INTEL_AVX2
4546
#define HAVE_INTEL_AVX2
47+
#endif /* HAVE_INTEL_AVX2 */
4648
#endif /* NO_AVX2_SUPPORT */
4749

4850
#ifdef WOLFSSL_AES_XTS

‎wolfcrypt/src/chacha_asm.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
#define HAVE_INTEL_AVX1
4343
#endif /* HAVE_INTEL_AVX1 */
4444
#ifndef NO_AVX2_SUPPORT
45+
#ifndef HAVE_INTEL_AVX2
4546
#define HAVE_INTEL_AVX2
47+
#endif /* HAVE_INTEL_AVX2 */
4648
#endif /* NO_AVX2_SUPPORT */
4749

4850
#ifdef WOLFSSL_X86_64_BUILD

‎wolfcrypt/src/fe_x25519_asm.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
#define HAVE_INTEL_AVX1
4343
#endif /* HAVE_INTEL_AVX1 */
4444
#ifndef NO_AVX2_SUPPORT
45+
#ifndef HAVE_INTEL_AVX2
4546
#define HAVE_INTEL_AVX2
47+
#endif /* HAVE_INTEL_AVX2 */
4648
#endif /* NO_AVX2_SUPPORT */
4749

4850
#ifndef __APPLE__

‎wolfcrypt/src/poly1305_asm.S‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
#define HAVE_INTEL_AVX1
4343
#endif /* HAVE_INTEL_AVX1 */
4444
#ifndef NO_AVX2_SUPPORT
45+
#ifndef HAVE_INTEL_AVX2
4546
#define HAVE_INTEL_AVX2
47+
#endif /* HAVE_INTEL_AVX2 */
4648
#endif /* NO_AVX2_SUPPORT */
4749

4850
#ifdef WOLFSSL_X86_64_BUILD

‎wolfcrypt/src/port/arm/armv8-32-aes-asm.S‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
* ../wolfssl/wolfcrypt/src/port/arm/armv8-32-aes-asm.S
2626
*/
2727

28-
#ifdef HAVE_CONFIG_H
29-
#include <config.h>
30-
#endif /* HAVE_CONFIG_H */
31-
#include <wolfssl/wolfcrypt/settings.h>
28+
#include <wolfssl/wolfcrypt/libwolfssl_sources_asm.h>
3229

3330
#ifdef WOLFSSL_ARMASM
3431
#if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)

‎wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,13 @@
2525
* ../wolfssl/wolfcrypt/src/port/arm/armv8-32-aes-asm.c
2626
*/
2727

28-
#ifdef HAVE_CONFIG_H
29-
#include <config.h>
30-
#endif /* HAVE_CONFIG_H */
31-
#include <wolfssl/wolfcrypt/settings.h>
28+
#include <wolfssl/wolfcrypt/libwolfssl_sources_asm.h>
3229
#include <wolfssl/wolfcrypt/error-crypt.h>
3330

3431
#ifdef WOLFSSL_ARMASM
3532
#if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
3633
#include <stdint.h>
37-
#ifdef HAVE_CONFIG_H
38-
#include <config.h>
39-
#endif /* HAVE_CONFIG_H */
40-
#include <wolfssl/wolfcrypt/settings.h>
41-
#include <wolfssl/wolfcrypt/error-crypt.h>
34+
#include <wolfssl/wolfcrypt/libwolfssl_sources.h>
4235
#ifdef WOLFSSL_ARMASM_INLINE
4336

4437
#ifdef __IAR_SYSTEMS_ICC__

‎wolfcrypt/src/port/arm/armv8-32-chacha-asm.S‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
* ../wolfssl/wolfcrypt/src/port/arm/armv8-32-chacha-asm.S
2626
*/
2727

28-
#ifdef HAVE_CONFIG_H
29-
#include <config.h>
30-
#endif /* HAVE_CONFIG_H */
31-
#include <wolfssl/wolfcrypt/settings.h>
28+
#include <wolfssl/wolfcrypt/libwolfssl_sources_asm.h>
3229

3330
#ifdef WOLFSSL_ARMASM
3431
#if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)

‎wolfcrypt/src/port/arm/armv8-32-chacha-asm_c.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,13 @@
2525
* ../wolfssl/wolfcrypt/src/port/arm/armv8-32-chacha-asm.c
2626
*/
2727

28-
#ifdef HAVE_CONFIG_H
29-
#include <config.h>
30-
#endif /* HAVE_CONFIG_H */
31-
#include <wolfssl/wolfcrypt/settings.h>
28+
#include <wolfssl/wolfcrypt/libwolfssl_sources_asm.h>
3229
#include <wolfssl/wolfcrypt/error-crypt.h>
3330

3431
#ifdef WOLFSSL_ARMASM
3532
#if !defined(__aarch64__) && !defined(WOLFSSL_ARMASM_THUMB2)
3633
#include <stdint.h>
37-
#ifdef HAVE_CONFIG_H
38-
#include <config.h>
39-
#endif /* HAVE_CONFIG_H */
40-
#include <wolfssl/wolfcrypt/settings.h>
41-
#include <wolfssl/wolfcrypt/error-crypt.h>
34+
#include <wolfssl/wolfcrypt/libwolfssl_sources.h>
4235
#ifdef WOLFSSL_ARMASM_INLINE
4336

4437
#ifdef __IAR_SYSTEMS_ICC__

0 commit comments

Comments
 (0)