|
939 | 939 |
|
940 | 940 | if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6 || test "$FIPS_VERSION" = "v5-dev"; then |
941 | 941 | test "$enable_aesxts" = "" && enable_aesxts=yes |
942 | | - test "$enable_aesxts_stream" = "" && test "$enable_aesxts" = "yes" && enable_aesxts_stream=yes |
| 942 | + test "$enable_aesxts_stream" = "" && test "$enable_aesxts" = "yes" && (test "$enable_armasm" = "" || test "$enable_armasm" = "no") && enable_aesxts_stream=yes |
943 | 943 | test "$enable_aessiv" = "" && enable_aessiv=yes |
944 | 944 | fi |
945 | 945 |
|
@@ -1079,7 +1079,7 @@ then |
1079 | 1079 |
|
1080 | 1080 | if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6 || test "$FIPS_VERSION" = "v5-dev"; then |
1081 | 1081 | test "$enable_aesxts" = "" && enable_aesxts=yes |
1082 | | - test "$enable_aesxts_stream" = "" && test "$enable_aesxts" = "yes" && enable_aesxts_stream=yes |
| 1082 | + test "$enable_aesxts_stream" = "" && test "$enable_aesxts" = "yes" && (test "$enable_armasm" = "" || test "$enable_armasm" = "no") && enable_aesxts_stream=yes |
1083 | 1083 | test "$enable_aessiv" = "" && enable_aessiv=yes |
1084 | 1084 | fi |
1085 | 1085 |
|
@@ -4849,10 +4849,16 @@ AC_ARG_ENABLE([aesxts], |
4849 | 4849 | [ ENABLED_AESXTS=$enableval ], |
4850 | 4850 | [ ENABLED_AESXTS=no ] |
4851 | 4851 | ) |
| 4852 | + |
| 4853 | +AS_IF([test "$ENABLED_AESXTS" = "yes" && test "$ENABLED_ARMASM" = "no"], |
| 4854 | + [ ENABLED_AESXTS_STREAM_DEFAULT=yes ], |
| 4855 | + [ ENABLED_AESXTS_STREAM_DEFAULT=no ] |
| 4856 | + ) |
| 4857 | + |
4852 | 4858 | AC_ARG_ENABLE([aesxts-stream], |
4853 | 4859 | [AS_HELP_STRING([--enable-aesxts-stream],[Enable wolfSSL AES-XTS support with streaming APIs (default: disabled)])], |
4854 | 4860 | [ ENABLED_AESXTS_STREAM=$enableval ], |
4855 | | - [ ENABLED_AESXTS_STREAM=$ENABLED_AESXTS ] |
| 4861 | + [ ENABLED_AESXTS_STREAM=$ENABLED_AESXTS_STREAM_DEFAULT ] |
4856 | 4862 | ) |
4857 | 4863 |
|
4858 | 4864 | # legacy old option name, for compatibility: |
@@ -5077,10 +5083,8 @@ AS_CASE([$FIPS_VERSION], |
5077 | 5083 | AS_IF([test "x$ENABLED_AESXTS" = "xyes" && test "x$ENABLED_AESNI" = "xyes"], |
5078 | 5084 | [AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_AES_XTS"]) |
5079 | 5085 |
|
5080 | | - AS_IF([test "x$ENABLED_AESXTS_STREAM" = "xno"], |
5081 | | - [ENABLED_AESXTS_STREAM="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AESXTS_STREAM"]) |
5082 | | - AS_IF([test "x$ENABLED_AESXTS_STREAM" = "xyes" && test "x$ENABLED_AESNI" = "xyes"], |
5083 | | - [AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_AESXTS_STREAM"]) |
| 5086 | + AS_IF([test "x$ENABLED_AESXTS_STREAM" = "xno" && ! (test "$ENABLED_ARMASM" = "yes" || test "$ENABLED_ARMASM_CRYPTO" = "no")], |
| 5087 | + [ENABLED_AESXTS_STREAM="yes"]) |
5084 | 5088 |
|
5085 | 5089 | AS_IF([(test "$ENABLED_AESCCM" = "yes" && test "$HAVE_AESCCM_PORT" != "yes") || |
5086 | 5090 | (test "$ENABLED_AESCTR" = "yes" && test "$HAVE_AESCTR_PORT" != "yes") || |
|
0 commit comments