3 files changed, 46 insertions, 2 deletions
diff --git a/nist/make-package.sh b/nist/make-package.sh
index c3bbd32..bdf3a27 100755
--- a/nist/make-package.sh
+++ b/nist/make-package.sh
@@ -113,8 +113,10 @@ do
     done
 done
 
+${NIST_DIR}/package-python.sh ${TMP_DIR}
+${NIST_DIR}/package-vhdl.sh ${TMP_DIR}
+
 cp -r ${TMP_DIR}/crypto_aead .
 
 cleanup
 
-${NIST_DIR}/package-python.sh
diff --git a/nist/package-python.sh b/nist/package-python.sh
index 88c4ef1..8d64e9f 100755
--- a/nist/package-python.sh
+++ b/nist/package-python.sh
@@ -2,6 +2,7 @@
 
 set -eu
 
+DEST_DIR=$1
 NIST_DIR=$(dirname $0)
 ROOT=${NIST_DIR}/..
 ADD_PYTHON=${ROOT}/src/add_python
@@ -15,7 +16,7 @@ add-variant ()
 
     local -A names=([1]=lilliputaei [2]=lilliputaeii)
 
-    variant_dir=crypto_aead/${names[${mode}]}${keylen}v1
+    local variant_dir=${DEST_DIR}/crypto_aead/${names[${mode}]}${keylen}v1
 
     cp -r ${ADD_PYTHON} ${variant_dir}
 
diff --git a/nist/package-vhdl.sh b/nist/package-vhdl.sh
new file mode 100755
index 0000000..1f2eba9
--- /dev/null
+++ b/nist/package-vhdl.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -eu
+
+DEST_DIR=$1
+NIST_DIR=$(dirname $0)
+ROOT=${NIST_DIR}/..
+ADD_VHDL=${ROOT}/src/add_vhdltbc
+
+
+add-variant ()
+{
+    local mode=$1
+    local keylen=$2
+
+    local variant_dir=${DEST_DIR}/crypto_aead/lilliputae${mode}${keylen}v1
+
+    local implems=(
+        encrypt
+        decrypt
+        encryptdecrypt
+    )
+
+    for implem in ${implems[@]}
+    do
+        local src=${ADD_VHDL}/${implem}
+        local dest=${variant_dir}/add_vhdltbc${implem}
+
+        mkdir ${dest}
+        cp -r ${src}/*.vhd ${src}/${mode}-${keylen}/* ${dest}
+    done
+}
+
+
+for mode in i ii
+do
+    for keylen in 128 192 256
+    do
+        add-variant ${mode} ${keylen}
+    done
+done