Merge commit '8e221ae797b229858a0b0d784577a8cb149d5789' into develop/…

…0.0.7

Modules/PQClean/.github/workflows/BADGES.md

@@ -18,9 +18,9 @@
 ![Test dilithium3](https://github.com/PQClean/PQClean/workflows/Test%20dilithium3/badge.svg?branch=master)
 ![Test dilithium5](https://github.com/PQClean/PQClean/workflows/Test%20dilithium5/badge.svg?branch=master)
 ![Test falcon-1024](https://github.com/PQClean/PQClean/workflows/Test%20falcon-1024/badge.svg?branch=master)
-![Test falcon-1024-padded](https://github.com/PQClean/PQClean/workflows/Test%20falcon-1024-padded/badge.svg?branch=master)
+![Test falcon-padded-1024](https://github.com/PQClean/PQClean/workflows/Test%20falcon-padded-1024/badge.svg?branch=master)
 ![Test falcon-512](https://github.com/PQClean/PQClean/workflows/Test%20falcon-512/badge.svg?branch=master)
-![Test falcon-512-padded](https://github.com/PQClean/PQClean/workflows/Test%20falcon-512-padded/badge.svg?branch=master)
+![Test falcon-padded-512](https://github.com/PQClean/PQClean/workflows/Test%20falcon-padded-512/badge.svg?branch=master)
 ![Test sphincs-sha2-128f-simple](https://github.com/PQClean/PQClean/workflows/Test%20sphincs-sha2-128f-simple/badge.svg?branch=master)
 ![Test sphincs-sha2-128s-simple](https://github.com/PQClean/PQClean/workflows/Test%20sphincs-sha2-128s-simple/badge.svg?branch=master)
 ![Test sphincs-sha2-192f-simple](https://github.com/PQClean/PQClean/workflows/Test%20sphincs-sha2-192f-simple/badge.svg?branch=master)

Modules/PQClean/.github/workflows/sign_falcon-1024-padded.yml → Modules/PQClean/.github/workflows/sign_falcon-padded-1024.yml

@@ -7,13 +7,13 @@ on:
       - 'test/**'
       # do not build if other schemes duplicate_consistency files change
       - '!test/duplicate_consistency/*.yml'
-      - 'test/duplicate_consistency/falcon-1024-padded*.yml'
+      - 'test/duplicate_consistency/falcon-padded-1024*.yml'
       # build if common files change
       - 'common/**'
       # build if scheme changed
-      - 'crypto_sign/falcon-1024-padded/**'
+      - 'crypto_sign/falcon-padded-1024/**'
       # build if workflow file changed
-      - '.github/workflows/sign_falcon-1024-padded.yml'
+      - '.github/workflows/sign_falcon-padded-1024.yml'
       # Build if any files in the root change, except .md files
       - '*'
       - '!*.md'
@@ -23,23 +23,23 @@ on:
       - 'test/**'
       # do not build if other schemes duplicate_consistency files change
       - '!test/duplicate_consistency/*.yml'
-      - 'test/duplicate_consistency/falcon-1024-padded*.yml'
+      - 'test/duplicate_consistency/falcon-padded-1024*.yml'
       # build if common files change
       - 'common/**'
       # build if scheme changed
-      - 'crypto_sign/falcon-1024-padded/**'
+      - 'crypto_sign/falcon-padded-1024/**'
       # build if workflow file changed
-      - '.github/workflows/sign_falcon-1024-padded.yml'
+      - '.github/workflows/sign_falcon-padded-1024.yml'
       # Build if any files in the root change, except .md files
       - '*'
       - '!*.md'
   schedule:
     - cron: '5 4 * * *'
 
-name: Test falcon-1024-padded
+name: Test falcon-padded-1024
 
 concurrency:
-  group: ci-falcon-1024-padded-${{ github.ref }}
+  group: ci-falcon-padded-1024-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -48,7 +48,7 @@ jobs:
     container:
       image: pqclean/ci-container:${{ matrix.arch }}
       env:
-        PQCLEAN_ONLY_SCHEMES: falcon-1024-padded
+        PQCLEAN_ONLY_SCHEMES: falcon-padded-1024
         CC: ccache ${{ matrix.cc }}
         CCACHE_NOSTATS: 1
         CCACHE_DIR: /ccache
@@ -123,7 +123,7 @@ jobs:
           key: v1-python-pip
       - name: Run tests in container
         run: |
-          docker run --rm -e CI -e CC -e PQCLEAN_ONLY_SCHEMES=falcon-1024-padded -v $PWD:$PWD -w $PWD -v ~/ccache:/ccache pqclean/ci-container:${{ matrix.arch }} /bin/bash -c "\
+          docker run --rm -e CI -e CC -e PQCLEAN_ONLY_SCHEMES=falcon-padded-1024 -v $PWD:$PWD -w $PWD -v ~/ccache:/ccache pqclean/ci-container:${{ matrix.arch }} /bin/bash -c "\
           export CCACHE_NOSTATS=1 && \
           export CCACHE_DIR=/ccache && \
           export CCACHE_SLOPPINESS=include_file_mtime && \
@@ -140,7 +140,7 @@ jobs:
           - x64
           - x86
     env:
-      PQCLEAN_ONLY_SCHEMES: falcon-1024-padded
+      PQCLEAN_ONLY_SCHEMES: falcon-padded-1024
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
@@ -171,7 +171,7 @@ jobs:
     needs:
       - test-native
     env:
-      PQCLEAN_ONLY_SCHEMES: falcon-1024-padded
+      PQCLEAN_ONLY_SCHEMES: falcon-padded-1024
       CCACHE_NOSTATS: 1
       CCACHE_SLOPPINESS: include_file_mtime
     strategy:

Modules/PQClean/.github/workflows/sign_falcon-512-padded.yml → Modules/PQClean/.github/workflows/sign_falcon-padded-512.yml

@@ -7,13 +7,13 @@ on:
       - 'test/**'
       # do not build if other schemes duplicate_consistency files change
       - '!test/duplicate_consistency/*.yml'
-      - 'test/duplicate_consistency/falcon-512-padded*.yml'
+      - 'test/duplicate_consistency/falcon-padded-512*.yml'
       # build if common files change
       - 'common/**'
       # build if scheme changed
-      - 'crypto_sign/falcon-512-padded/**'
+      - 'crypto_sign/falcon-padded-512/**'
       # build if workflow file changed
-      - '.github/workflows/sign_falcon-512-padded.yml'
+      - '.github/workflows/sign_falcon-padded-512.yml'
       # Build if any files in the root change, except .md files
       - '*'
       - '!*.md'
@@ -23,23 +23,23 @@ on:
       - 'test/**'
       # do not build if other schemes duplicate_consistency files change
       - '!test/duplicate_consistency/*.yml'
-      - 'test/duplicate_consistency/falcon-512-padded*.yml'
+      - 'test/duplicate_consistency/falcon-padded-512*.yml'
       # build if common files change
       - 'common/**'
       # build if scheme changed
-      - 'crypto_sign/falcon-512-padded/**'
+      - 'crypto_sign/falcon-padded-512/**'
       # build if workflow file changed
-      - '.github/workflows/sign_falcon-512-padded.yml'
+      - '.github/workflows/sign_falcon-padded-512.yml'
       # Build if any files in the root change, except .md files
       - '*'
       - '!*.md'
   schedule:
     - cron: '5 4 * * *'
 
-name: Test falcon-512-padded
+name: Test falcon-padded-512
 
 concurrency:
-  group: ci-falcon-512-padded-${{ github.ref }}
+  group: ci-falcon-padded-512-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -48,7 +48,7 @@ jobs:
     container:
       image: pqclean/ci-container:${{ matrix.arch }}
       env:
-        PQCLEAN_ONLY_SCHEMES: falcon-512-padded
+        PQCLEAN_ONLY_SCHEMES: falcon-padded-512
         CC: ccache ${{ matrix.cc }}
         CCACHE_NOSTATS: 1
         CCACHE_DIR: /ccache
@@ -123,7 +123,7 @@ jobs:
           key: v1-python-pip
       - name: Run tests in container
         run: |
-          docker run --rm -e CI -e CC -e PQCLEAN_ONLY_SCHEMES=falcon-512-padded -v $PWD:$PWD -w $PWD -v ~/ccache:/ccache pqclean/ci-container:${{ matrix.arch }} /bin/bash -c "\
+          docker run --rm -e CI -e CC -e PQCLEAN_ONLY_SCHEMES=falcon-padded-512 -v $PWD:$PWD -w $PWD -v ~/ccache:/ccache pqclean/ci-container:${{ matrix.arch }} /bin/bash -c "\
           export CCACHE_NOSTATS=1 && \
           export CCACHE_DIR=/ccache && \
           export CCACHE_SLOPPINESS=include_file_mtime && \
@@ -140,7 +140,7 @@ jobs:
           - x64
           - x86
     env:
-      PQCLEAN_ONLY_SCHEMES: falcon-512-padded
+      PQCLEAN_ONLY_SCHEMES: falcon-padded-512
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
@@ -171,7 +171,7 @@ jobs:
     needs:
       - test-native
     env:
-      PQCLEAN_ONLY_SCHEMES: falcon-512-padded
+      PQCLEAN_ONLY_SCHEMES: falcon-padded-512
       CCACHE_NOSTATS: 1
       CCACHE_SLOPPINESS: include_file_mtime
     strategy:

Modules/PQClean/crypto_sign/falcon-1024/aarch64/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON1024_AARCH64_CRYPTO_ALGNAME          "Falcon-1024"
 
-#define PQCLEAN_FALCON1024PADDED_AARCH64_CRYPTO_BYTES      1280 // used in signature verification
+#define PQCLEAN_FALCONPADDED1024_AARCH64_CRYPTO_BYTES      1280 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-1024/aarch64/pqclean.c

@@ -252,7 +252,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON1024PADDED_AARCH64_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED1024_AARCH64_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-1024/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON1024_AVX2_CRYPTO_ALGNAME          "Falcon-1024"
 
-#define PQCLEAN_FALCON1024PADDED_AVX2_CRYPTO_BYTES      1280 // used in signature verification
+#define PQCLEAN_FALCONPADDED1024_AVX2_CRYPTO_BYTES      1280 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-1024/avx2/pqclean.c

@@ -251,7 +251,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON1024PADDED_AVX2_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED1024_AVX2_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-1024/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON1024_CLEAN_CRYPTO_ALGNAME          "Falcon-1024"
 
-#define PQCLEAN_FALCON1024PADDED_CLEAN_CRYPTO_BYTES      1280 // used in signature verification
+#define PQCLEAN_FALCONPADDED1024_CLEAN_CRYPTO_BYTES      1280 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-1024/clean/pqclean.c

@@ -251,7 +251,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON1024PADDED_CLEAN_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED1024_CLEAN_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-512/aarch64/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON512_AARCH64_CRYPTO_ALGNAME          "Falcon-512"
 
-#define PQCLEAN_FALCON512PADDED_AARCH64_CRYPTO_BYTES      666 // used in signature verification
+#define PQCLEAN_FALCONPADDED512_AARCH64_CRYPTO_BYTES      666 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-512/aarch64/pqclean.c

@@ -252,7 +252,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON512PADDED_AARCH64_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED512_AARCH64_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-512/avx2/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON512_AVX2_CRYPTO_ALGNAME          "Falcon-512"
 
-#define PQCLEAN_FALCON512PADDED_AVX2_CRYPTO_BYTES      666 // used in signature verification
+#define PQCLEAN_FALCONPADDED512_AVX2_CRYPTO_BYTES      666 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-512/avx2/pqclean.c

@@ -251,7 +251,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON512PADDED_AVX2_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED512_AVX2_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-512/clean/api.h

@@ -10,7 +10,7 @@
 
 #define PQCLEAN_FALCON512_CLEAN_CRYPTO_ALGNAME          "Falcon-512"
 
-#define PQCLEAN_FALCON512PADDED_CLEAN_CRYPTO_BYTES      666 // used in signature verification
+#define PQCLEAN_FALCONPADDED512_CLEAN_CRYPTO_BYTES      666 // used in signature verification
 
 /*
  * Generate a new key pair. Public key goes into pk[], private key in sk[].

Modules/PQClean/crypto_sign/falcon-512/clean/pqclean.c

@@ -251,7 +251,7 @@ do_verify(
         return -1;
     }
     if (v != sigbuflen) {
-        if (sigbuflen == PQCLEAN_FALCON512PADDED_CLEAN_CRYPTO_BYTES - NONCELEN - 1) {
+        if (sigbuflen == PQCLEAN_FALCONPADDED512_CLEAN_CRYPTO_BYTES - NONCELEN - 1) {
             while (v < sigbuflen) {
                 if (sigbuf[v++] != 0) {
                     return -1;

Modules/PQClean/crypto_sign/falcon-1024-padded/META.yml → Modules/PQClean/crypto_sign/falcon-padded-1024/META.yml

@@ -1,5 +1,5 @@
 ---
-name: Falcon-1024 (PADDED)
+name: Falcon-padded-1024
 type: signature
 claimed-nist-level: 5
 length-public-key: 1793

Modules/PQClean/crypto_sign/falcon-1024-padded/aarch64/Makefile → Modules/PQClean/crypto_sign/falcon-padded-1024/aarch64/Makefile

@@ -1,6 +1,6 @@
 # This Makefile can be used with GNU Make or BSD Make
 
-LIB=libfalcon-1024-padded_aarch64.a
+LIB=libfalcon-padded-1024_aarch64.a
 
 SOURCES = codec.c keygen.c poly_float.c common.c fft_tree.c pqclean.c poly_int.c sign.c fpr.c ntt.c rng.c util.c fft.c ntt_consts.c sampler.c vrfy.c
 OBJECTS = codec.o keygen.o poly_float.o common.o fft_tree.o pqclean.o poly_int.o sign.o fpr.o ntt.o rng.o util.o fft.o ntt_consts.o sampler.o vrfy.o