Fixed test code (removed static reference to aes_x86ni code).

[BearSSL] / mk / mkrules.sh

diff --git a/mk/mkrules.sh b/mk/mkrules.sh
index b03566b..8df63f4 100755 (executable)
--- a/mk/mkrules.sh
+++ b/mk/mkrules.sh
@@ -49,6 +49,10 @@ set -e
 
 # Source files. Please keep in alphabetical order.
 coresrc=" \
+       src/settings.c \
+       src/aead/ccm.c \
+       src/aead/eax.c \
+       src/aead/gcm.c \
        src/codec/ccopy.c \
        src/codec/dec16be.c \
        src/codec/dec16le.c \
@@ -164,6 +168,7 @@ coresrc=" \
        src/mac/hmac.c \
        src/mac/hmac_ct.c \
        src/rand/hmac_drbg.c \
+       src/rand/sysrng.c \
        src/rsa/rsa_default_pkcs1_sign.c \
        src/rsa/rsa_default_pkcs1_vrfy.c \
        src/rsa/rsa_default_priv.c \
@@ -208,6 +213,7 @@ coresrc=" \
        src/ssl/ssl_hs_client.c \
        src/ssl/ssl_hs_server.c \
        src/ssl/ssl_io.c \
+       src/ssl/ssl_keyexport.c \
        src/ssl/ssl_lru.c \
        src/ssl/ssl_rec_cbc.c \
        src/ssl/ssl_rec_chapol.c \
@@ -227,6 +233,7 @@ coresrc=" \
        src/symcipher/aes_big_cbcdec.c \
        src/symcipher/aes_big_cbcenc.c \
        src/symcipher/aes_big_ctr.c \
+       src/symcipher/aes_big_ctrcbc.c \
        src/symcipher/aes_big_dec.c \
        src/symcipher/aes_big_enc.c \
        src/symcipher/aes_common.c \
@@ -235,11 +242,13 @@ coresrc=" \
        src/symcipher/aes_ct64_cbcdec.c \
        src/symcipher/aes_ct64_cbcenc.c \
        src/symcipher/aes_ct64_ctr.c \
+       src/symcipher/aes_ct64_ctrcbc.c \
        src/symcipher/aes_ct64_dec.c \
        src/symcipher/aes_ct64_enc.c \
        src/symcipher/aes_ct_cbcdec.c \
        src/symcipher/aes_ct_cbcenc.c \
        src/symcipher/aes_ct_ctr.c \
+       src/symcipher/aes_ct_ctrcbc.c \
        src/symcipher/aes_ct_dec.c \
        src/symcipher/aes_ct_enc.c \
        src/symcipher/aes_pwr8.c \
@@ -249,13 +258,16 @@ coresrc=" \
        src/symcipher/aes_small_cbcdec.c \
        src/symcipher/aes_small_cbcenc.c \
        src/symcipher/aes_small_ctr.c \
+       src/symcipher/aes_small_ctrcbc.c \
        src/symcipher/aes_small_dec.c \
        src/symcipher/aes_small_enc.c \
        src/symcipher/aes_x86ni.c \
        src/symcipher/aes_x86ni_cbcdec.c \
        src/symcipher/aes_x86ni_cbcenc.c \
        src/symcipher/aes_x86ni_ctr.c \
+       src/symcipher/aes_x86ni_ctrcbc.c \
        src/symcipher/chacha20_ct.c \
+       src/symcipher/chacha20_sse2.c \
        src/symcipher/des_ct.c \
        src/symcipher/des_ct_cbcdec.c \
        src/symcipher/des_ct_cbcenc.c \
@@ -281,12 +293,14 @@ toolssrc=" \
        tools/client.c \
        tools/errors.c \
        tools/files.c \
+       tools/impl.c \
        tools/keys.c \
        tools/names.c \
        tools/server.c \
        tools/skey.c \
        tools/sslio.c \
        tools/ta.c \
+       tools/twrch.c \
        tools/vector.c \
        tools/verify.c \
        tools/xmem.c"
@@ -306,6 +320,7 @@ testx509src=" \
 # Public header files.
 headerspub=" \
        inc/bearssl.h \
+       inc/bearssl_aead.h \
        inc/bearssl_block.h \
        inc/bearssl_ec.h \
        inc/bearssl_hash.h \
@@ -377,23 +392,23 @@ EOF
 
 (printf "\nOBJ ="
 for f in $coresrc ; do
-       printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
+       printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
 done
 printf "\nOBJBRSSL ="
 for f in $toolssrc ; do
-       printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
+       printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
 done
 printf "\nOBJTESTCRYPTO ="
 for f in $testcryptosrc ; do
-       printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
+       printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
 done
 printf "\nOBJTESTSPEED ="
 for f in $testspeedsrc ; do
-       printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
+       printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
 done
 printf "\nOBJTESTX509 ="
 for f in $testx509src ; do
-       printf ' $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
+       printf ' \\\n $(OBJDIR)$P%s' "$(basename "$f" .c)\$O"
 done
 printf "\nHEADERSPUB ="
 for f in $headerspub ; do
@@ -431,7 +446,9 @@ tools: \$(BRSSL)
 
 tests: \$(TESTCRYPTO) \$(TESTSPEED) \$(TESTX509)
 
-T0: \$(T0COMP)
+T0: kT0
+
+kT0: \$(T0COMP) src\$Pssl\$Pssl_hs_common.t0 src\$Pssl\$Pssl_hs_client.t0 src\$Pssl\$Pssl_hs_server.t0 src\$Px509\$Pasn1.t0 src\$Px509\$Pskey_decoder.t0 src\$Px509\$Px509_decoder.t0 src\$Px509\$Px509_minimal.t0
        \$(RUNT0COMP) -o src\$Pcodec\$Ppemdec -r br_pem_decoder src\$Pcodec\$Ppemdec.t0
        \$(RUNT0COMP) -o src\$Pssl\$Pssl_hs_client -r br_ssl_hs_client src\$Pssl\$Pssl_hs_common.t0 src\$Pssl\$Pssl_hs_client.t0
        \$(RUNT0COMP) -o src\$Pssl\$Pssl_hs_server -r br_ssl_hs_server src\$Pssl\$Pssl_hs_common.t0 src\$Pssl\$Pssl_hs_server.t0