Some more renaming to avoid shadowing.

[BearSSL] / mk / mkrules.sh

diff --git a/mk/mkrules.sh b/mk/mkrules.sh
index 4c9d2cd..26f8546 100755 (executable)
--- a/mk/mkrules.sh
+++ b/mk/mkrules.sh
@@ -49,6 +49,7 @@ set -e
 
 # Source files. Please keep in alphabetical order.
 coresrc=" \
+       src/aead/gcm.c \
        src/codec/ccopy.c \
        src/codec/dec16be.c \
        src/codec/dec16le.c \
@@ -100,6 +101,7 @@ coresrc=" \
        src/hash/ghash_ctmul32.c \
        src/hash/ghash_ctmul64.c \
        src/hash/ghash_pclmul.c \
+       src/hash/ghash_pwr8.c \
        src/hash/md5.c \
        src/hash/md5sha1.c \
        src/hash/multihash.c \
@@ -133,6 +135,7 @@ coresrc=" \
        src/int/i31_fmont.c \
        src/int/i31_iszero.c \
        src/int/i31_modpow.c \
+       src/int/i31_modpow2.c \
        src/int/i31_montmul.c \
        src/int/i31_mulacc.c \
        src/int/i31_muladd.c \
@@ -158,6 +161,7 @@ coresrc=" \
        src/int/i32_reduce.c \
        src/int/i32_sub.c \
        src/int/i32_tmont.c \
+       src/int/i62_modpow2.c \
        src/mac/hmac.c \
        src/mac/hmac_ct.c \
        src/rand/hmac_drbg.c \
@@ -177,6 +181,10 @@ coresrc=" \
        src/rsa/rsa_i32_pkcs1_vrfy.c \
        src/rsa/rsa_i32_priv.c \
        src/rsa/rsa_i32_pub.c \
+       src/rsa/rsa_i62_pkcs1_sign.c \
+       src/rsa/rsa_i62_pkcs1_vrfy.c \
+       src/rsa/rsa_i62_priv.c \
+       src/rsa/rsa_i62_pub.c \
        src/rsa/rsa_pkcs1_sig_pad.c \
        src/rsa/rsa_pkcs1_sig_unpad.c \
        src/rsa/rsa_ssl_decrypt.c \
@@ -201,6 +209,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 \
@@ -235,6 +244,10 @@ coresrc=" \
        src/symcipher/aes_ct_ctr.c \
        src/symcipher/aes_ct_dec.c \
        src/symcipher/aes_ct_enc.c \
+       src/symcipher/aes_pwr8.c \
+       src/symcipher/aes_pwr8_cbcdec.c \
+       src/symcipher/aes_pwr8_cbcenc.c \
+       src/symcipher/aes_pwr8_ctr.c \
        src/symcipher/aes_small_cbcdec.c \
        src/symcipher/aes_small_cbcenc.c \
        src/symcipher/aes_small_ctr.c \
@@ -245,6 +258,7 @@ coresrc=" \
        src/symcipher/aes_x86ni_cbcenc.c \
        src/symcipher/aes_x86ni_ctr.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 \
@@ -254,6 +268,7 @@ coresrc=" \
        src/symcipher/des_tab_cbcenc.c \
        src/symcipher/poly1305_ctmul.c \
        src/symcipher/poly1305_ctmul32.c \
+       src/symcipher/poly1305_ctmulq.c \
        src/symcipher/poly1305_i15.c \
        src/x509/skey_decoder.c \
        src/x509/x509_decoder.c \
@@ -275,6 +290,7 @@ toolssrc=" \
        tools/skey.c \
        tools/sslio.c \
        tools/ta.c \
+       tools/twrch.c \
        tools/vector.c \
        tools/verify.c \
        tools/xmem.c"
@@ -294,6 +310,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 \
@@ -419,7 +436,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