Skip to content

Commit 4331bc0

Browse files
committed
configure.ac: on armasm, disable ENABLED_AESXTS_STREAM by default (not implemented).
1 parent 2fe366c commit 4331bc0

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

configure.ac

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ then
939939

940940
if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6 || test "$FIPS_VERSION" = "v5-dev"; then
941941
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
943943
test "$enable_aessiv" = "" && enable_aessiv=yes
944944
fi
945945

@@ -1079,7 +1079,7 @@ then
10791079

10801080
if test "$ENABLED_FIPS" = "no" || test "$HAVE_FIPS_VERSION" -ge 6 || test "$FIPS_VERSION" = "v5-dev"; then
10811081
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
10831083
test "$enable_aessiv" = "" && enable_aessiv=yes
10841084
fi
10851085

@@ -4849,10 +4849,16 @@ AC_ARG_ENABLE([aesxts],
48494849
[ ENABLED_AESXTS=$enableval ],
48504850
[ ENABLED_AESXTS=no ]
48514851
)
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+
48524858
AC_ARG_ENABLE([aesxts-stream],
48534859
[AS_HELP_STRING([--enable-aesxts-stream],[Enable wolfSSL AES-XTS support with streaming APIs (default: disabled)])],
48544860
[ ENABLED_AESXTS_STREAM=$enableval ],
4855-
[ ENABLED_AESXTS_STREAM=$ENABLED_AESXTS ]
4861+
[ ENABLED_AESXTS_STREAM=$ENABLED_AESXTS_STREAM_DEFAULT ]
48564862
)
48574863

48584864
# legacy old option name, for compatibility:
@@ -5077,10 +5083,8 @@ AS_CASE([$FIPS_VERSION],
50775083
AS_IF([test "x$ENABLED_AESXTS" = "xyes" && test "x$ENABLED_AESNI" = "xyes"],
50785084
[AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_AES_XTS"])
50795085
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"])
50845088
50855089
AS_IF([(test "$ENABLED_AESCCM" = "yes" && test "$HAVE_AESCCM_PORT" != "yes") ||
50865090
(test "$ENABLED_AESCTR" = "yes" && test "$HAVE_AESCTR_PORT" != "yes") ||

0 commit comments

Comments
 (0)