update dockerfile and installer

Author: hadipourh

README.md

@@ -11,31 +11,34 @@ This repository hosts the source code for the tools presented in our paper, acce
 
 ## Table of Contents
 
-- [Required Software](#required-software)
-- [Installation](#installation)
-  - [Method 1](#method-1)
-  - [Method 2](#method-2)
-- [Structure of Our Tool](#structure-of-our-tool)
-- [Usage](#usage)
-  - [Example 1: TWINE](#example-1-twine)
-  - [Example 2: WARP](#example-2-warp)
-  - [Example 3: AES](#example-3-aes)
-  - [Example 4: Ascon](#example-4-ascon)
-- [Analytical Estimations](#analytical-estimations)
-  - [Example 1: 8 Rounds of TWINE (Basic)](#example-1-8-rounds-of-twine-basic)
-  - [Example 2: 3 Rounds of AES (Medium)](#example-2-3-rounds-of-aes-medium)
-  - [Example 3: 9 Rounds of TWINE (Medium)](#example-3-9-rounds-of-twine-medium)
-  - [Example 4: 10 Rounds of TWINE (Complex)](#example-4-10-rounds-of-twine-complex)
-- [Experimental Verification](#experimental-verification)
-  - [Example 1: AES](#example-1-aes)
-  - [Example 2: TWINE](#example-2-twine)
-  - [Example 3: Ascon](#example-3-ascon)
-  - [Example 4: WARP](#example-4-warp)
-- [Encoding S-boxes and Other Building Block Functions](#encoding-s-boxes-and-other-building-block-functions)
-- [Verifying Proposition 2](#verifying-proposition-2)
-- [References](#references)
-- [Citation](#citation)
-- [License](#license)
+- [Revisiting Differential-Linear Attacks via a Boomerang Perspective](#revisiting-differential-linear-attacks-via-a-boomerang-perspective)
+  - [Table of Contents](#table-of-contents)
+  - [Required Software](#required-software)
+  - [Installation](#installation)
+    - [Method 1](#method-1)
+    - [Method 2](#method-2)
+    - [Installing Gurobi and `gurobipy`](#installing-gurobi-and-gurobipy)
+  - [Structure of Our Tool](#structure-of-our-tool)
+  - [Usage](#usage)
+    - [Example 1: TWINE](#example-1-twine)
+    - [Example 2: WARP](#example-2-warp)
+    - [Example 3: AES](#example-3-aes)
+    - [Example 4: Ascon](#example-4-ascon)
+  - [Analythical Estimations](#analythical-estimations)
+    - [Example 1: 8 Rounds of TWINE (Basic)](#example-1-8-rounds-of-twine-basic)
+    - [Example 2: 3 Rounds of AES (Medium)](#example-2-3-rounds-of-aes-medium)
+    - [Example 3: 9 Rounds of TWINE (Medium)](#example-3-9-rounds-of-twine-medium)
+    - [Example 4: 10 Rounds of TWINE (Complex)](#example-4-10-rounds-of-twine-complex)
+  - [Experimental Verification](#experimental-verification)
+    - [Example 1: AES](#example-1-aes)
+    - [Example 2: TWINE](#example-2-twine)
+    - [Example 3: Ascon](#example-3-ascon)
+    - [Example 4: WARP](#example-4-warp)
+  - [Encoding S-boxes and Other Building Block Functions](#encoding-s-boxes-and-other-building-block-functions)
+  - [Verifying Proposition 2](#verifying-proposition-2)
+  - [References](#references)
+  - [Citation](#citation)
+  - [License ](#license-)
 
 ## Required Software
 
@@ -82,30 +85,24 @@ To install MiniZinc and required Python packages in Ubuntu, one can use the foll
 
 ```bash
 #!/bin/bash
-
 # Update and upgrade system packages
-sudo apt update -y
-sudo apt upgrade -y
+apt update -y
+apt upgrade -y
 
 # Install system dependencies
-sudo apt install -y python3-full python3-pip python3-venv git wget curl
-
-# Create a working directory
-mkdir -p "$HOME/minizinc_install"
-cd "$HOME/minizinc_install"
+apt install -y python3-full python3-pip python3-venv git wget curl
 
 # Download and extract the latest MiniZinc release
 LATEST_MINIZINC_VERSION=$(curl -s https://api.github.com/repos/MiniZinc/MiniZincIDE/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')
-wget "https://github.com/MiniZinc/MiniZincIDE/releases/download/$LATEST_MINIZINC_VERSION/MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz"
-tar -xvzf MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz
-mv MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64 "$HOME/minizinc"
-rm MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz
-
-# Clean up the created folders
-rm -rf "$HOME/minizinc_install"
+wget "https://github.com/MiniZinc/MiniZincIDE/releases/download/${LATEST_MINIZINC_VERSION}/MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz"
+mkdir -p "$HOME/minizinc"
+tar -xvzf "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz" -C "$HOME/minizinc" --strip-components=1
+rm "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz"
 
-# Add MiniZinc to system PATH
-sudo ln -sf "$HOME/minizinc/bin/minizinc" /usr/local/bin/minizinc
+# Create a wrapper script to call MiniZinc with proper LD_LIBRARY_PATH
+echo '#!/bin/bash' > /usr/local/bin/minizinc
+echo "exec env LD_LIBRARY_PATH=\$HOME/minizinc/lib:\$LD_LIBRARY_PATH \$HOME/minizinc/bin/minizinc \"\$@\"" >> /usr/local/bin/minizinc
+chmod +x /usr/local/bin/minizinc
 
 # Create a Python virtual environment
 python3 -m venv "$HOME/dlvenv"
@@ -125,6 +122,7 @@ python3 -m pip install gurobipy
 ```
 
 For detailed instructions on installing Gurobi and obtaining an academic license, refer to the [GrabGurobi repository](https://github.com/hadipourh/grabgurobi).
+The above commands are included in the [install.sh](install.sh) script, which can be executed to set up the environment.
 
 ## Structure of Our Tool
 We have developed our tools using a modular approach to ensure flexibility and maintainability. The workflow is divided into three main modules:

docker/Dockerfile

@@ -20,14 +20,19 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install MiniZinc
+# Install MiniZinc with proper library path handling
 WORKDIR /home 
-RUN LATEST_MINIZINC_VERSION=$(curl -s https://api.github.com/repos/MiniZinc/MiniZincIDE/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")') \
-    && wget "https://github.com/MiniZinc/MiniZincIDE/releases/download/$LATEST_MINIZINC_VERSION/MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz" \
+RUN LATEST_MINIZINC_VERSION=$(curl -s https://api.github.com/repos/MiniZinc/MiniZincIDE/releases/latest \
+    | grep -oP '"tag_name": "\K[^"]+') \
+    && wget "https://github.com/MiniZinc/MiniZincIDE/releases/download/${LATEST_MINIZINC_VERSION}/MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz" \
     && mkdir MiniZinc \
-    && tar -xvzf "MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz" -C MiniZinc --strip-components=1 \
-    && rm "MiniZincIDE-$LATEST_MINIZINC_VERSION-bundle-linux-x86_64.tgz"
-RUN ln -s /home/MiniZinc/bin/minizinc /usr/local/bin/minizinc
+    && tar -xzf "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz" -C MiniZinc --strip-components=1 \
+    && rm "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz"
+
+# Create wrapper to set correct LD_LIBRARY_PATH at runtime
+RUN echo '#!/bin/bash\nLD_LIBRARY_PATH=/home/MiniZinc/lib:$LD_LIBRARY_PATH exec /home/MiniZinc/bin/minizinc "$@"' \
+    > /usr/local/bin/minizinc \
+    && chmod +x /usr/local/bin/minizinc
 
 # Clone DL repository
 RUN git clone https://github.com/hadipourh/DL
@@ -41,5 +46,9 @@ RUN python3 -m venv myenv
 # Install required Python packages
 RUN myenv/bin/python3 -m pip install --no-cache-dir pyyaml minizinc gurobipy numpy
 
-# Clean up APT cache
+# Set the entrypoint to the virtual environment's Python interpreter
+ENTRYPOINT ["/bin/bash", "-c", "source /home/DL/myenv/bin/activate && exec /bin/bash"]
+# Set the working directory for the container
+WORKDIR /home/DL
+# Clean up cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*

installer.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# Update and upgrade system packages
+apt update -y
+apt upgrade -y
+
+# Install system dependencies
+apt install -y python3-full python3-pip python3-venv git wget curl
+
+# Download and extract the latest MiniZinc release
+LATEST_MINIZINC_VERSION=$(curl -s https://api.github.com/repos/MiniZinc/MiniZincIDE/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")')
+wget "https://github.com/MiniZinc/MiniZincIDE/releases/download/${LATEST_MINIZINC_VERSION}/MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz"
+mkdir -p "$HOME/minizinc"
+tar -xvzf "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz" -C "$HOME/minizinc" --strip-components=1
+rm "MiniZincIDE-${LATEST_MINIZINC_VERSION}-bundle-linux-x86_64.tgz"
+
+# Create a wrapper script to call MiniZinc with proper LD_LIBRARY_PATH
+echo '#!/bin/bash' > /usr/local/bin/minizinc
+echo "exec env LD_LIBRARY_PATH=\$HOME/minizinc/lib:\$LD_LIBRARY_PATH \$HOME/minizinc/bin/minizinc \"\$@\"" >> /usr/local/bin/minizinc
+chmod +x /usr/local/bin/minizinc
+
+# Create a Python virtual environment
+python3 -m venv "$HOME/dlvenv"
+source "$HOME/dlvenv/bin/activate"
+
+# Install Python packages
+pip install --upgrade pip
+pip install minizinc
+pip install sagemath  # Note: this is not the full SageMath system
+pip install gurobipy