[implem-python] Génération des vecteurs dans une fonction

Pour que ce soit plus simple de remplacer la boucle par

    generate 2 128
    generate 1 256

… ce qui prend 6 minutes au lieu de 20 sur ma machine \o/

1 files changed, 20 insertions, 10 deletions

diff --git a/test/python/generate-vectors.sh b/test/python/generate-vectors.sh
index e328c67..d37f15f 100755
--- a/test/python/generate-vectors.sh
+++ b/test/python/generate-vectors.sh
@@ -10,22 +10,32 @@ CRYPTO_AEAD=${RESULTS_DIR}/crypto_aead_py
 
 mkdir -p ${CRYPTO_AEAD}/lilliputae{i,ii}{128,192,256}v1
 
-declare -A names=([1]=lilliputaei [2]=lilliputaeii)
+declare -A NAMES=([1]=lilliputaei [2]=lilliputaeii)
 
-for mode in 1 2
-do
-    for keylen in 128 192 256
-    do
-        echo generating for ${mode} ${keylen}
 
-        cat <<EOF > ${RESULTS_DIR}/parameters.py
+generate ()
+{
+    local mode=$1
+    local keylen=$2
+
+    echo generating for ${mode} ${keylen}
+
+    cat <<EOF > ${RESULTS_DIR}/parameters.py
 MODE = ${mode}
 KEYBYTES = $((keylen/8))
 EOF
 
-        PYTHONPATH=${RESULTS_DIR}:${SRC_DIR} ${PYTHON_DIR}/genkat_aead.py
+    PYTHONPATH=${RESULTS_DIR}:${SRC_DIR} ${PYTHON_DIR}/genkat_aead.py
 
-        dest=${CRYPTO_AEAD}/${names[${mode}]}${keylen}v1
-        mv LWC_AEAD_KAT_${keylen}_120.txt ${dest}
+    dest=${CRYPTO_AEAD}/${NAMES[${mode}]}${keylen}v1
+    mv LWC_AEAD_KAT_${keylen}_120.txt ${dest}
+}
+
+
+for mode in 1 2
+do
+    for keylen in 128 192 256
+    do
+        generate ${mode} ${keylen}
     done
 done