Skip to content

Commit e532e5a

Browse files
rben-devrben-dev
authored
Merge branch 'open-quantum-safe:main' into main
2 parents 0627eb3 + cb2d43e commit e532e5a

File tree

43 files changed

+83
-116
lines changed
  • README.md
  • docs/algorithms/sig
  • scripts/copy_from_upstream
  • src/sig/cross
    • upcross_cross-rsdp-128-balanced_avx2
    • upcross_cross-rsdp-128-balanced_clean
    • upcross_cross-rsdp-128-fast_avx2
    • upcross_cross-rsdp-128-fast_clean
    • upcross_cross-rsdp-128-small_avx2
    • upcross_cross-rsdp-128-small_clean
    • upcross_cross-rsdp-192-balanced_avx2
    • upcross_cross-rsdp-192-balanced_clean
    • upcross_cross-rsdp-192-fast_avx2
    • upcross_cross-rsdp-192-fast_clean
    • upcross_cross-rsdp-192-small_avx2
    • upcross_cross-rsdp-192-small_clean
    • upcross_cross-rsdp-256-balanced_avx2
    • upcross_cross-rsdp-256-balanced_clean
    • upcross_cross-rsdp-256-fast_avx2
    • upcross_cross-rsdp-256-fast_clean
    • upcross_cross-rsdp-256-small_avx2
    • upcross_cross-rsdp-256-small_clean
    • upcross_cross-rsdpg-128-balanced_avx2
    • upcross_cross-rsdpg-128-balanced_clean
    • upcross_cross-rsdpg-128-fast_avx2
    • upcross_cross-rsdpg-128-fast_clean
    • upcross_cross-rsdpg-128-small_avx2
    • upcross_cross-rsdpg-128-small_clean
    • upcross_cross-rsdpg-192-balanced_avx2
    • upcross_cross-rsdpg-192-balanced_clean
    • upcross_cross-rsdpg-192-fast_avx2
    • upcross_cross-rsdpg-192-fast_clean
    • upcross_cross-rsdpg-192-small_avx2
    • upcross_cross-rsdpg-192-small_clean
    • upcross_cross-rsdpg-256-balanced_avx2
    • upcross_cross-rsdpg-256-balanced_clean
    • upcross_cross-rsdpg-256-fast_avx2
    • upcross_cross-rsdpg-256-fast_clean
    • upcross_cross-rsdpg-256-small_avx2
    • upcross_cross-rsdpg-256-small_clean

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+83
-116
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ All names other than `ML-KEM` and `ML-DSA` are subject to change. `liboqs` makes
7070
#### Signature schemes
7171
| Algorithm family | Standardization status | Primary implementation |
7272
|:-------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------|
73-
| CROSS | Under [NIST](https://www.cross-crypto.com/CROSS_Specification_v2.2.pdf) consideration | [`CROSS-signature/CROSS-lib-oqs@c8f7411`](https://github.com/CROSS-signature/CROSS-lib-oqs/commit/c8f7411fed136f0e37600973fa3dbed53465e54f) |
73+
| CROSS | Under [NIST](https://www.cross-crypto.com/CROSS_Specification_v2.2.pdf) consideration | [`CROSS-signature/CROSS-lib-oqs@a21ebc3`](https://github.com/CROSS-signature/CROSS-lib-oqs/commit/a21ebc314e06b0972a9bbcf2813a185ecb2917f1) |
7474
| Falcon | Selected by [NIST](https://csrc.nist.gov/CSRC/media/Projects/post-quantum-cryptography/documents/round-3/submissions/Falcon-Round3.zip) for upcoming standardization | [`PQClean/PQClean@1eacfda`](https://github.com/PQClean/PQClean/commit/1eacfdafc15ddc5d5759d0b85b4cef26627df181) |
7575
| MAYO | Under [NIST](https://csrc.nist.gov/csrc/media/Projects/pqc-dig-sig/documents/round-2/spec-files/mayo-spec-round2-web.pdf) consideration | [`PQCMayo/MAYO-C@4b7cd94`](https://github.com/PQCMayo/MAYO-C/commit/4b7cd94c96b9522864efe40c6ad1fa269584a807) |
7676
| ML-DSA | Standardized by [NIST](https://csrc.nist.gov/pubs/fips/204/final) | [`pq-code-package/mldsa-native@f48f164`](https://github.com/pq-code-package/mldsa-native/commit/f48f164cefb07f4ffa519ddda7cee670b8ee3517) |

‎docs/algorithms/sig/cross.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
- **Authors' website**: https://www.cross-crypto.com/
88
- **Specification version**: 2.2 + PQClean and OQS patches.
99
- **Primary Source**<a name="primary-source"></a>:
10-
- **Source**: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/c8f7411fed136f0e37600973fa3dbed53465e54f
10+
- **Source**: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/a21ebc314e06b0972a9bbcf2813a185ecb2917f1
1111
- **Implementation license (SPDX-Identifier)**: CC0-1.0
1212
- **Optimized Implementation sources**:
1313
- **avx2**:<a name="avx2"></a>
14-
- **Source**: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/c8f7411fed136f0e37600973fa3dbed53465e54f
14+
- **Source**: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/a21ebc314e06b0972a9bbcf2813a185ecb2917f1
1515
- **Implementation license (SPDX-Identifier)**: CC0-1.0
1616

1717

‎docs/algorithms/sig/cross.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ standardization-status: Under [NIST](https://www.cross-crypto.com/CROSS_Specific
2626
consideration
2727
spec-version: 2.2 + PQClean and OQS patches
2828
primary-upstream:
29-
source: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/c8f7411fed136f0e37600973fa3dbed53465e54f
29+
source: https://github.com/CROSS-signature/CROSS-lib-oqs/commit/a21ebc314e06b0972a9bbcf2813a185ecb2917f1
3030
spdx-license-identifier: CC0-1.0
3131
parameter-sets:
3232
- name: cross-rsdp-128-balanced

‎scripts/copy_from_upstream/copy_from_upstream.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ upstreams:
7575
name: upcross
7676
git_url: https://github.com/CROSS-signature/CROSS-lib-oqs.git
7777
git_branch: master
78-
git_commit: c8f7411fed136f0e37600973fa3dbed53465e54f
78+
git_commit: a21ebc314e06b0972a9bbcf2813a185ecb2917f1
7979
sig_meta_path: 'generate/crypto_sign/{pqclean_scheme}/META.yml'
8080
sig_scheme_path: 'generate/crypto_sign/{pqclean_scheme}'
8181
-

‎src/sig/cross/upcross_cross-rsdp-128-balanced_avx2/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

‎src/sig/cross/upcross_cross-rsdp-128-balanced_clean/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

‎src/sig/cross/upcross_cross-rsdp-128-fast_avx2/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

‎src/sig/cross/upcross_cross-rsdp-128-fast_clean/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

‎src/sig/cross/upcross_cross-rsdp-128-small_avx2/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

‎src/sig/cross/upcross_cross-rsdp-128-small_clean/sign.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,14 @@ int crypto_sign_verify(const unsigned char *sig, // in parameter
125125
const unsigned char *pk // in parameter
126126
) {
127127

128-
/* PQClean-edit: unused parameter */
129-
(void)siglen;
130-
131128
/* verify returns 1 if signature is ok, 0 otherwise */
132129
int ok = CROSS_verify((const pk_t * const) pk, // in parameter
133130
(const char *const) m, // in parameter
134131
(const size_t) mlen, // in parameter
135132
(const CROSS_sig_t *const) sig); // in parameter
136133

134+
/* liboqs-edit: check signature length */
135+
ok = ok && (siglen == sizeof(CROSS_sig_t));
137136

138137
return ok - 1; // NIST convention: 0 == zero errors, -1 == error condition
139138
} // end crypto_sign_verify

0 commit comments

Comments
 (0)