Prepare for LSH dynamic dispatch

Author: noloader

Makefile.am

@@ -75,6 +75,10 @@ EXTRA_LTLIBRARIES = \
    libgf2n_simd.la \
    libkeccak_simd.la \
    liblea_simd.la \
+   liblsh256_sse.la \
+   liblsh256_avx.la \
+   liblsh512_sse.la \
+   liblsh512_avx.la \
    libneon_simd.la \
    libppc_simd.la \
    libppc_power7.la \
@@ -126,6 +130,10 @@ libcryptopp_la_LIBADD = \
    $(libgf2n_simd_la_OBJECTS) \
    $(libkeccak_simd_la_OBJECTS) \
    $(liblea_simd_la_OBJECTS) \
+   $(liblsh256_sse_la_OBJECTS) \
+   $(liblsh256_avx_la_OBJECTS) \
+   $(liblsh512_sse_la_OBJECTS) \
+   $(liblsh512_avx_la_OBJECTS) \
    $(libneon_simd_la_OBJECTS) \
    $(libppc_simd_la_OBJECTS) \
    $(libppc_power7_la_OBJECTS) \
@@ -169,10 +177,14 @@ libcryptopp_la_DEPENDENCIES = \
    $(libcham_simd_la_OBJECTS) \
    $(libcrc_simd_la_OBJECTS) \
    $(libdonna_sse_la_OBJECTS) \
-   $(libkeccak_simd_la_OBJECTS) \
-   $(liblea_simd_la_OBJECTS) \
    $(libgcm_simd_la_OBJECTS) \
    $(libgf2n_simd_la_OBJECTS) \
+   $(libkeccak_simd_la_OBJECTS) \
+   $(liblea_simd_la_OBJECTS) \
+   $(liblsh256_sse_la_OBJECTS) \
+   $(liblsh256_avx_la_OBJECTS) \
+   $(liblsh512_sse_la_OBJECTS) \
+   $(liblsh512_avx_la_OBJECTS) \
    $(libneon_simd_la_OBJECTS) \
    $(libppc_simd_la_OBJECTS) \
    $(libppc_power7_la_OBJECTS) \
@@ -252,6 +264,18 @@ libkeccak_simd_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_KECCAK_FLAG)
 liblea_simd_la_SOURCES = lea_simd.cpp
 liblea_simd_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_LEA_FLAG)
 
+liblsh256_sse_la_SOURCES = lsh256_sse.cpp
+liblsh256_sse_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_LSH256_FLAG)
+
+liblsh256_avx_la_SOURCES = lsh256_avx.cpp
+liblsh256_avx_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_LSH256_AVX2_FLAG)
+
+liblsh512_sse_la_SOURCES = lsh512_sse.cpp
+liblsh512_sse_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_LSH512_FLAG)
+
+liblsh512_avx_la_SOURCES = lsh512_avx.cpp
+liblsh512_avx_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_LSH512_AVX2_FLAG)
+
 libneon_simd_la_SOURCES = neon_simd.cpp
 libneon_simd_la_CXXFLAGS = $(AM_CXXFLAGS) $(CRYPTOPP_NEON_FLAG)
 

configure.ac

@@ -992,6 +992,8 @@ if test "$IS_IA32" = "1" && test "$IS_GNUC_COMPILER" = "1"; then
       AC_SUBST([CRYPTOPP_CHAM_FLAG], [$CXXFLAGS])
       AC_SUBST([CRYPTOPP_KECCAK_FLAG], [$CXXFLAGS])
       AC_SUBST([CRYPTOPP_LEA_FLAG], [$CXXFLAGS])
+      AC_SUBST([CRYPTOPP_LSH256_FLAG], [$CXXFLAGS])
+      AC_SUBST([CRYPTOPP_LSH512_FLAG], [$CXXFLAGS])
       AC_SUBST([CRYPTOPP_SIMON128_FLAG], [$CXXFLAGS])
       AC_SUBST([CRYPTOPP_SPECK128_FLAG], [$CXXFLAGS])
       AC_DEFINE([CRYPTOPP_SSSE3_AVAILABLE], [1], [Enable SSSE3])
@@ -1155,7 +1157,6 @@ if test "$IS_IA32" = "1" && test "$IS_GNUC_COMPILER" = "1"; then
    )
 
    if test "$retval" = "0"; then
-      AC_SUBST([CRYPTOPP_CHACHA_AVX_FLAG], [$CXXFLAGS])
       AC_DEFINE([CRYPTOPP_AVX_AVAILABLE], [1], [Enable AVX])
    else
       AC_DEFINE([CRYPTOPP_DISABLE_AVX], [1], [Disable AVX])
@@ -1180,6 +1181,8 @@ if test "$IS_IA32" = "1" && test "$IS_GNUC_COMPILER" = "1"; then
 
    if test "$retval" = "0"; then
       AC_SUBST([CRYPTOPP_CHACHA_AVX2_FLAG], [$CXXFLAGS])
+      AC_SUBST([CRYPTOPP_LSH256_AVX2_FLAG], [$CXXFLAGS])
+      AC_SUBST([CRYPTOPP_LSH512_AVX2_FLAG], [$CXXFLAGS])
       AC_DEFINE([CRYPTOPP_AVX2_AVAILABLE], [1], [Enable AVX2])
    else
       AC_DEFINE([CRYPTOPP_DISABLE_AVX2], [1], [Disable AVX2])
@@ -1285,6 +1288,8 @@ if test "$IS_IA32" != "0" && test "$IS_SUN_COMPILER" != "0"; then
       AC_SUBST([CRYPTOPP_CHAM_FLAG], [$CXXFLAGSX])
       AC_SUBST([CRYPTOPP_KECCAK_FLAG], [$CXXFLAGSX])
       AC_SUBST([CRYPTOPP_LEA_FLAG], [$CXXFLAGSX])
+      AC_SUBST([CRYPTOPP_LSH256_FLAG], [$CXXFLAGSX])
+      AC_SUBST([CRYPTOPP_LSH512_FLAG], [$CXXFLAGSX])
       AC_SUBST([CRYPTOPP_SIMON128_FLAG], [$CXXFLAGSX])
       AC_SUBST([CRYPTOPP_SPECK128_FLAG], [$CXXFLAGSX])
       AC_DEFINE([CRYPTOPP_SSSE3_AVAILABLE], [1], [Enable SSSE3])
@@ -1411,6 +1416,8 @@ if test "$IS_IA32" != "0" && test "$IS_SUN_COMPILER" != "0"; then
    if test "$retval" = "0"; then
       CXXFLAGSX="$CXXFLAGS -D__AVX2__=1"
       AC_SUBST([CRYPTOPP_CHACHA_AVX2_FLAG], [$CXXFLAGSX])
+      AC_SUBST([CRYPTOPP_LSH256_AVX2_FLAG], [$CXXFLAGSX])
+      AC_SUBST([CRYPTOPP_LSH512_AVX2_FLAG], [$CXXFLAGSX])
       AC_DEFINE([CRYPTOPP_AVX2_AVAILABLE], [1], [Enable AVX2])
       AM_LDFLAGS="$AM_LDFLAGS $CXXFLAGS"
    else
@@ -2680,6 +2687,18 @@ fi
 if test x"$CRYPTOPP_LEA_FLAG" != "x"; then
    echo "CRYPTOPP_LEA_FLAG: $CRYPTOPP_LEA_FLAG"
 fi
+if test x"$CRYPTOPP_LSH256_FLAG" != "x"; then
+   echo "CRYPTOPP_LSH256_FLAG: $CRYPTOPP_LSH256_FLAG"
+fi
+if test x"$CRYPTOPP_LSH512_FLAG" != "x"; then
+   echo "CRYPTOPP_LSH512_FLAG: $CRYPTOPP_LSH512_FLAG"
+fi
+if test x"$CRYPTOPP_LSH256_AVX2_FLAG" != "x"; then
+   echo "CRYPTOPP_LSH256_AVX2_FLAG: $CRYPTOPP_LSH256_AVX2_FLAG"
+fi
+if test x"$CRYPTOPP_LSH512_AVX2_FLAG" != "x"; then
+   echo "CRYPTOPP_LSH512_AVX2_FLAG: $CRYPTOPP_LSH512_AVX2_FLAG"
+fi
 if test x"$CRYPTOPP_KECCAK_FLAG" != "x"; then
    echo "CRYPTOPP_KECCAK_FLAG: $CRYPTOPP_KECCAK_FLAG"
 fi