Merge pull request #6398 from liranmauda/liran-isa-l-2.23

Bumping isa-l_crypto to 2.23

Author: liranmauda

src/native/chunk/splitter.cpp

@@ -2,6 +2,7 @@
 #include "splitter.h"
 
 #include "../util/common.h"
+#include "../util/endian.h"
 
 namespace noobaa
 {
@@ -86,7 +87,10 @@ Splitter::finish(uint8_t* md5, uint8_t* sha256)
     if (md5) {
         if (_md5_mb_ctx) {
             md5_mb_submit_and_flush(0, 0, HASH_LAST);
-            memcpy(md5, hash_ctx_digest(_md5_mb_ctx), MD5_DIGEST_NWORDS * 4);
+            uint32_t *digest = reinterpret_cast<uint32_t*>(md5);
+            for (int i = 0; i < MD5_DIGEST_NWORDS; i++) {
+                digest[i] = le32toh(hash_ctx_digest(_md5_mb_ctx)[i]);
+            }
         } else if (_md5_ctx) {
             EVP_DigestFinal_ex(_md5_ctx, md5, 0);
         } else {

src/native/third_party/isa-l.gyp

@@ -129,7 +129,7 @@
             ],
             # compile asm only for x64 until we have support for ppc
             # see https://github.com/intel/isa-l/issues/7
-            'conditions': [['node_arch=="x64"', {'sources': [
+            'conditions': [['node_arch=="x64" or node_arch=="x32"', {'sources': [
                 'isa-l_crypto/md5_mb/md5_ctx_sse.c',
                 'isa-l_crypto/md5_mb/md5_ctx_avx.c',
                 'isa-l_crypto/md5_mb/md5_ctx_avx2.c',
@@ -150,7 +150,18 @@
                 'isa-l_crypto/md5_mb/md5_mb_mgr_flush_avx512.asm',
                 'isa-l_crypto/md5_mb/md5_mb_x16x2_avx512.asm',
                 'isa-l_crypto/md5_mb/md5_ctx_avx512.c',
-            ]}]],
+            ]}, 'node_arch=="arm64"', {'sources': [
+                'isa-l_crypto/md5_mb/aarch64/md5_ctx_aarch64_asimd.c',
+                'isa-l_crypto/md5_mb/aarch64/md5_mb_aarch64_dispatcher.c',
+                'isa-l_crypto/md5_mb/aarch64/md5_mb_mgr_aarch64_asimd.c',
+                'isa-l_crypto/md5_mb/aarch64/md5_mb_asimd_x4.S',
+                'isa-l_crypto/md5_mb/aarch64/md5_mb_asimd_x1.S',
+                'isa-l_crypto/md5_mb/aarch64/md5_mb_multibinary.S',
+            ]}, {
+                'sources': [
+                    'isa-l_crypto/md5_mb/md5_ctx_base_aliases.c',
+                ]
+            }]],
         },
 
         {
@@ -166,7 +177,7 @@
             ],
             # compile asm only for x64 until we have support for ppc
             # see https://github.com/intel/isa-l/issues/7
-            'conditions': [['node_arch=="x64"', {'sources': [
+            'conditions': [['node_arch=="x64" or node_arch=="x32"', {'sources': [
                 'isa-l_crypto/sha1_mb/sha1_ctx_sse.c',
                 'isa-l_crypto/sha1_mb/sha1_ctx_avx.c',
                 'isa-l_crypto/sha1_mb/sha1_ctx_avx2.c',
@@ -195,9 +206,18 @@
                 'isa-l_crypto/sha1_mb/sha1_mb_mgr_submit_sse_ni.asm',
                 'isa-l_crypto/sha1_mb/sha1_mb_mgr_flush_sse_ni.asm',
                 'isa-l_crypto/sha1_mb/sha1_mb_mgr_flush_avx512_ni.asm',
+            ]}, 'node_arch=="arm64"', {'sources': [
+                'isa-l_crypto/sha1_mb/sha1_ref.c',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_mb_multibinary.S',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_ctx_ce.c',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_mb_x1_ce.S',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_mb_x2_ce.S',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_mb_mgr_ce.c',
+                'isa-l_crypto/sha1_mb/aarch64/sha1_mb_aarch64_dispatcher.c',
             ]}, {
                 'sources': [
                     'isa-l_crypto/sha1_mb/sha1_ctx_base_aliases.c',
+                    'isa-l_crypto/sha1_mb/sha1_ref.c',
                 ]
             }]],
         },

src/native/third_party/isa-l_crypto/Doxyfile

@@ -15,10 +15,12 @@ INPUT                  = isa-l_crypto.h \
 			 CONTRIBUTING.md \
 			 Release_notes.txt
 
-EXCLUDE                = include/test.h
+EXCLUDE                = include/test.h include/memcpy_inline.h include/intrinreg.h include/endian_helper.h
+EXCLUDE_PATTERNS       = */include/*_multibinary.h
 EXAMPLE_PATH           = . aes md5_mb mh_sha1 mh_sha1_murmur3_x64_128 mh_sha256 rolling_hash sha1_mb sha256_mb sha512_mb
 PAPER_TYPE             = letter
 LATEX_SOURCE_CODE      = YES
+GENERATE_TREEVIEW      = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 PREDEFINED             = "DECLARE_ALIGNED(n, a)=ALIGN n" \

src/native/third_party/isa-l_crypto/Makefile.am

@@ -3,7 +3,7 @@ CLEANFILES =
 LDADD =
 AM_MAKEFLAGS = --no-print-directory
 noinst_HEADERS =
-pkginclude_HEADERS = include/test.h include/types.h
+pkginclude_HEADERS = include/test.h include/types.h include/endian_helper.h
 noinst_LTLIBRARIES =
 INCLUDE = -I $(srcdir)/include/
 
@@ -34,20 +34,25 @@ perf_tests32=
 # Include units
 include sha1_mb/Makefile.am
 include mh_sha1/Makefile.am
-if !CPU_AARCH64
 include md5_mb/Makefile.am
 include sha256_mb/Makefile.am
 include sha512_mb/Makefile.am
 include mh_sha1_murmur3_x64_128/Makefile.am
 include mh_sha256/Makefile.am
-include aes/Makefile.am
 include rolling_hash/Makefile.am
 include sm3_mb/Makefile.am
+
+if CPU_X86_64
+include aes/Makefile.am
+endif
+
+if CPU_X86_32
+include aes/Makefile.am
 endif
 
 # LIB version info not necessarily the same as package version
 LIBISAL_CURRENT=2
-LIBISAL_REVISION=22
+LIBISAL_REVISION=23
 LIBISAL_AGE=0
 
 lib_LTLIBRARIES = libisal_crypto.la
@@ -103,17 +108,29 @@ test: $(addsuffix .run,$(unit_tests))
 	@echo Completed run: $<
 
 # Support for yasm/nasm
+if INTEL_CET_ENABLED
+  export CET_LD=$(LD)
+endif
 if USE_YASM
+if INTEL_CET_ENABLED
+  as_filter = ${srcdir}/tools/yasm-cet-filter.sh
+else
   as_filter = ${srcdir}/tools/yasm-filter.sh
 endif
+endif
 if USE_NASM
+if INTEL_CET_ENABLED
+  as_filter = ${srcdir}/tools/nasm-cet-filter.sh
+else
   as_filter = ${srcdir}/tools/nasm-filter.sh
 endif
+endif
 if CPU_AARCH64
-  as_filter = gcc -D__ASSEMBLY__
+  as_filter = $(CC) -D__ASSEMBLY__
 endif
 CCAS = $(as_filter)
 EXTRA_DIST += tools/yasm-filter.sh tools/nasm-filter.sh
+EXTRA_DIST += tools/yasm-cet-filter.sh tools/nasm-cet-filter.sh
 
 AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${D}
 AM_CCASFLAGS = ${yasm_args} ${INCLUDE} $(src_include) ${DEFS} ${D}
@@ -128,6 +145,11 @@ CLEANFILES += isa-l_crypto.h
 isa-l_crypto.h:
 	@echo 'Building $@'
 	@echo ''			>> $@
+	@echo '/**'			>> $@
+	@echo ' *  @file isa-l_crypto.h'>> $@
+	@echo ' *  @brief Include for ISA-L_crypto library'	>> $@
+	@echo ' */'			>> $@
+	@echo ''			>> $@
 	@echo '#ifndef _ISAL_CRYPTO_H_'	>> $@
 	@echo '#define _ISAL_CRYPTO_H_'	>> $@
 	@echo ''			>> $@