Test merging main to develop

.github/workflows/build-claasp-base-image.yaml

@@ -2,14 +2,14 @@ name: Build and push Intel and M1 images for testing
 on:
   push:
     branches:
-      - main
+      - test_merging_main_to_develop
 
 jobs:
   build-image:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -20,14 +20,6 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
-    - name: Cache Docker layers
-      uses: actions/cache@v3
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
     - name: Login Docker Hub
       uses: docker/login-action@v3
       with:
@@ -41,12 +33,19 @@ jobs:
         context: .
         file: ./docker/Dockerfile
         push: true
-        tags: ${{ matrix.os == 'ubuntu-latest' && 'tiicrc/claasp-base:latest' || 'tiicrc/claasp-m1-base:latest' }}
+        tags: tiicrc/claasp-base:latest1
         target: claasp-base
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-    - name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+        cache-from: type=gha,scope=claasp-base
+        cache-to: type=gha,scope=claasp-base,mode=max
+
+    - name: Build & Push (m1)
+      uses: docker/build-push-action@v4
+      id: built-image-m1
+      with:
+        context: .
+        file: ./docker/Dockerfile
+        push: true
+        tags: tiicrc/claasp-m1-base:latest1
+        target: claasp-base
+        cache-from: type=gha,scope=claasp-base-m1
+        cache-to: type=gha,scope=claasp-base-m1,mode=max

.gitignore

@@ -118,3 +118,9 @@ local/
 upstream/
 
 SAGE_BIN_PATH
+
+# experiments codes
+diff_ca_kalyna.py
+diff_ca_sm4.py
+diff_ca_sm4_2.py
+output_kalyna.txt

claasp/DTOs/component_state.py

@@ -1,17 +1,16 @@
-
 # ****************************************************************************
 # Copyright 2023 Technology Innovation Institute
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # ****************************************************************************

claasp/DTOs/power_of_2_word_based_dto.py

@@ -1,24 +1,22 @@
-
 # ****************************************************************************
 # Copyright 2023 Technology Innovation Institute
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 # ****************************************************************************
 
 
 class PowerOf2WordBasedDTO:
-
     def __init__(self, word_size=None, fixed=False):
         self._word_size = word_size
         self._fixed = fixed