From 14488f9a94e1a544cd3678bdb52f9676003980fb Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Thu, 4 Jul 2019 10:34:02 +0200
Subject: Ajout d'un fichier de version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

L'idée étant que tous les scripts  qui génèrent des dossiers au format
crypto_aead consultent ce fichier au lieu de coder la version en dur.

Un tag  git pourrait probablement  être utilisé au lieu  d'un fichier.
À réfléchir.
---
 VERSION                         | 1 +
 nist/make-package.sh            | 9 ++++++---
 nist/package-python.sh          | 4 +++-
 nist/package-vhdl.sh            | 4 +++-
 nist/version.sh                 | 9 +++++++++
 test/python/generate-vectors.sh | 6 ++++--
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 VERSION
 create mode 100755 nist/version.sh

diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..9459d4b
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.1
diff --git a/nist/make-package.sh b/nist/make-package.sh
index bdf3a27..78384b8 100755
--- a/nist/make-package.sh
+++ b/nist/make-package.sh
@@ -7,7 +7,7 @@ shopt -s extglob
 #
 # crypto_aead
 # │
-# └── lilliputae${mode}${keylen}v1
+# └── lilliputae${mode}${keylen}v${VERSION}
 #     │
 #     ├── add_${someimplementation}
 #     │   ├── api.h
@@ -27,6 +27,9 @@ NIST_DIR=$(dirname $0)
 ROOT=${NIST_DIR}/..
 TMP_DIR=$(mktemp -d)
 
+VERSION=$(${NIST_DIR}/version.sh)
+
+
 cleanup ()
 {
     rm -r ${TMP_DIR}
@@ -58,7 +61,7 @@ add-variant ()
 {
     mode=$1
     key_length=$2
-    variant=lilliputae${mode}${key_length}v1
+    variant=lilliputae${mode}${key_length}v${VERSION}
     dest=${TMP_DIR}/crypto_aead/${variant}
 
     mkdir -p ${dest}
@@ -85,7 +88,7 @@ test-variant ()
 {
     mode=$1
     key_length=$2
-    variant=lilliputae${mode}${key_length}v1
+    variant=lilliputae${mode}${key_length}v${VERSION}
     dest=${TMP_DIR}/crypto_aead/${variant}
     src=${dest}/ref
 
diff --git a/nist/package-python.sh b/nist/package-python.sh
index 8d64e9f..31192c7 100755
--- a/nist/package-python.sh
+++ b/nist/package-python.sh
@@ -5,6 +5,8 @@ set -eu
 DEST_DIR=$1
 NIST_DIR=$(dirname $0)
 ROOT=${NIST_DIR}/..
+
+VERSION=$(${NIST_DIR}/version.sh)
 ADD_PYTHON=${ROOT}/src/add_python
 PYTHON_RESOURCES=${ROOT}/test/python/
 
@@ -16,7 +18,7 @@ add-variant ()
 
     local -A names=([1]=lilliputaei [2]=lilliputaeii)
 
-    local variant_dir=${DEST_DIR}/crypto_aead/${names[${mode}]}${keylen}v1
+    local variant_dir=${DEST_DIR}/crypto_aead/${names[${mode}]}${keylen}v${VERSION}
 
     cp -r ${ADD_PYTHON} ${variant_dir}
 
diff --git a/nist/package-vhdl.sh b/nist/package-vhdl.sh
index 1f2eba9..b604ba4 100755
--- a/nist/package-vhdl.sh
+++ b/nist/package-vhdl.sh
@@ -5,6 +5,8 @@ set -eu
 DEST_DIR=$1
 NIST_DIR=$(dirname $0)
 ROOT=${NIST_DIR}/..
+
+VERSION=$(${NIST_DIR}/version.sh)
 ADD_VHDL=${ROOT}/src/add_vhdltbc
 
 
@@ -13,7 +15,7 @@ add-variant ()
     local mode=$1
     local keylen=$2
 
-    local variant_dir=${DEST_DIR}/crypto_aead/lilliputae${mode}${keylen}v1
+    local variant_dir=${DEST_DIR}/crypto_aead/lilliputae${mode}${keylen}v${VERSION}
 
     local implems=(
         encrypt
diff --git a/nist/version.sh b/nist/version.sh
new file mode 100755
index 0000000..72990ab
--- /dev/null
+++ b/nist/version.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+NIST_DIR=$(dirname $0)
+ROOT=${NIST_DIR}/..
+
+version=$(cat ${ROOT}/VERSION)
+echo ${version//[^0-9]/}
diff --git a/test/python/generate-vectors.sh b/test/python/generate-vectors.sh
index 3f68d6c..7e2dded 100755
--- a/test/python/generate-vectors.sh
+++ b/test/python/generate-vectors.sh
@@ -8,7 +8,9 @@ SRC_DIR=${ROOT_DIR}/src/add_python
 RESULTS_DIR=${ROOT_DIR}/results
 CRYPTO_AEAD=${RESULTS_DIR}/crypto_aead_py
 
-mkdir -p ${CRYPTO_AEAD}/lilliputae{i,ii}{128,192,256}v1
+VERSION=$(${ROOT_DIR}/nist/version.sh)
+
+mkdir -p ${CRYPTO_AEAD}/lilliputae{i,ii}{128,192,256}v${VERSION}
 
 declare -A NAMES=([1]=lilliputaei [2]=lilliputaeii)
 
@@ -17,7 +19,7 @@ generate ()
 {
     local mode=$1
     local keylen=$2
-    local dest_dir=${CRYPTO_AEAD}/${NAMES[${mode}]}${keylen}v1
+    local dest_dir=${CRYPTO_AEAD}/${NAMES[${mode}]}${keylen}v${VERSION}
     local param_dir=${RESULTS_DIR}/python-${mode}-${keylen}
 
     mkdir -p ${param_dir}
-- 
cgit v1.2.3