 +  )
 +list(APPEND aes_srcs
 +  aes/aes_locl.h
++  aes/aes_core.c # aes_asm_src DEFAULT (Configurations/00-base-templates.conf)
++  aes/aes_cbc.c # aes_asm_src DEFAULT (Configurations/00-base-templates.conf)
 +  )
 +source_group(aes FILES ${aes_srcs})
 +list(APPEND ${lib_name}_libsrcs ${aes_srcs})
 +##########
-+set(aes_extra # in directory, not in build.info
-+  aes/aes_cbc.c
-+  aes/aes_core.c
++set(aes_extra
 +  aes/aes_x86core.c
 +  )
 +list(APPEND aes_extra # TODO asm

+# chacha
+set(chacha_srcs # order from crypto/chacha/build.info
+  chacha/build.info
+  )
+source_group(chacha FILES ${chacha_srcs})
+list(APPEND ${lib_name}_libsrcs ${chacha_srcs})
+##########
+set(chacha_extra # in directory, not in build.info
+  chacha/chacha_enc.c
+  )
+list(APPEND chacha_extra # TODO asm
+  chacha/asm/chacha-armv4.pl
+  chacha/asm/chacha-armv8.pl
+  chacha/asm/chacha-c64xplus.pl

+  )
+list(APPEND sha_srcs
+  sha/sha_locl.h
+  sha/keccak1600.c # keccak1600_asm_src DEFAULT (Configurations/00-base-templates.conf)
+  )
+source_group(sha FILES ${sha_srcs})
+list(APPEND ${lib_name}_libsrcs ${sha_srcs})
+##########
+set(sha_extra # TODO asm
+  sha/asm/keccak1600-armv4.pl
+  sha/asm/keccak1600-armv8.pl
+  sha/asm/keccak1600-avx2.pl
