Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare 240 for merge #301

Closed
wants to merge 19 commits into from
Closed

Prepare 240 for merge #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b9865bf
added to gitignore
trigpolynom Nov 8, 2023
940cd41
Merge remote-tracking branch 'upstream/main'
trigpolynom Nov 8, 2023
7cd6837
added to gitignore
trigpolynom Nov 8, 2023
eacb157
successfully tested dilithium2withsha256 from adding to generate.yml …
trigpolynom Nov 12, 2023
dfca393
passing test results for all unit tests
trigpolynom Nov 13, 2023
d863b60
reverting gitignore change
trigpolynom Nov 13, 2023
300614e
reverting gitignore change
trigpolynom Nov 13, 2023
fb2d594
fixed test failure
trigpolynom Nov 13, 2023
5d7e1fd
reformatted to fix clang errors
trigpolynom Nov 18, 2023
0b68a62
fixed format of oqsencoder/decoder
trigpolynom Nov 18, 2023
27776b9
added test to static cmakelist tests
trigpolynom Nov 18, 2023
9db1782
passed the ASAN tests
trigpolynom Nov 28, 2023
30a1fd1
committing new algs
trigpolynom Dec 5, 2023
cde8bbf
added debugging
trigpolynom Dec 8, 2023
7a08da2
fixed code point issue in generate.yml
trigpolynom Dec 8, 2023
3301d38
fixed clang-format issues
trigpolynom Dec 8, 2023
e7af68d
changed printf to fprintf for hashnsign test
trigpolynom Dec 8, 2023
dc2a0d6
needed to fix clang-format
trigpolynom Dec 8, 2023
96cbee0
fixed merge
trigpolynom Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ liboqs
# installed SW
.local
# build directory
_build
/_build
/build
# generated from openssl src:
test/ssltestlib.c
test/ssltestlib.h
Expand Down
196 changes: 158 additions & 38 deletions ALGORITHMS.md
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ This implementation makes available the following quantum safe algorithms:

### Signature algorithms

- **CRYSTALS-Dilithium**:`dilithium2`\*, `p256_dilithium2`\*, `rsa3072_dilithium2`\*, `dilithium3`\*, `p384_dilithium3`\*, `dilithium5`\*, `p521_dilithium5`\*
- **Falcon**:`falcon512`\*, `p256_falcon512`\*, `rsa3072_falcon512`\*, `falcon1024`\*, `p521_falcon1024`\*
- **CRYSTALS-Dilithium**:`dilithium2`\*, `p256_dilithium2`\*, `rsa3072_dilithium2`\*, `dilithium2WithSha256`\*, `dilithium2WithSha384`\*, `dilithium2WithSha512`\*, `dilithium2WithSha3At256`\*, `dilithium2WithSha3At384`\*, `dilithium2WithSha3At512`\*, `dilithium2WithShake128`\*, `dilithium2WithShake256`\*, `dilithium3`\*, `p384_dilithium3`\*, `dilithium3WithSha256`\*, `dilithium3WithSha384`\*, `dilithium3WithSha512`\*, `dilithium3WithSha3At256`\*, `dilithium3WithSha3At384`\*, `dilithium3WithSha3At512`\*, `dilithium3WithShake128`\*, `dilithium3WithShake256`\*, `dilithium5`\*, `p521_dilithium5`\*, `dilithium5WithSha256`\*, `dilithium5WithSha384`\*, `dilithium5WithSha512`\*, `dilithium5WithSha3At256`\*, `dilithium5WithSha3At384`\*, `dilithium5WithSha3At512`\*, `dilithium5WithShake128`\*, `dilithium5WithShake256`\*
- **Falcon**:`falcon512`\*, `p256_falcon512`\*, `rsa3072_falcon512`\*, `falcon512WithSha256`\*, `falcon512WithSha384`\*, `falcon512WithSha512`\*, `falcon512WithSha3At256`\*, `falcon512WithSha3At384`\*, `falcon512WithSha3At512`\*, `falcon512WithShake128`\*, `falcon512WithShake256`\*, `falcon1024`\*, `p521_falcon1024`\*, `falcon1024WithSha256`\*, `falcon1024WithSha384`\*, `falcon1024WithSha512`\*, `falcon1024WithSha3At256`\*, `falcon1024WithSha3At384`\*, `falcon1024WithSha3At512`\*, `falcon1024WithShake128`\*, `falcon1024WithShake256`\*

- **SPHINCS-SHA2**:`sphincssha2128fsimple`\*, `p256_sphincssha2128fsimple`\*, `rsa3072_sphincssha2128fsimple`\*, `sphincssha2128ssimple`\*, `p256_sphincssha2128ssimple`\*, `rsa3072_sphincssha2128ssimple`\*, `sphincssha2192fsimple`\*, `p384_sphincssha2192fsimple`\*, `sphincssha2192ssimple`, `p384_sphincssha2192ssimple`, `sphincssha2256fsimple`, `p521_sphincssha2256fsimple`, `sphincssha2256ssimple`, `p521_sphincssha2256ssimple`
- **SPHINCS-SHAKE**:`sphincsshake128fsimple`\*, `p256_sphincsshake128fsimple`\*, `rsa3072_sphincsshake128fsimple`\*, `sphincsshake128ssimple`, `p256_sphincsshake128ssimple`, `rsa3072_sphincsshake128ssimple`, `sphincsshake192fsimple`, `p384_sphincsshake192fsimple`, `sphincsshake192ssimple`, `p384_sphincsshake192ssimple`, `sphincsshake256fsimple`, `p521_sphincsshake256fsimple`, `sphincsshake256ssimple`, `p521_sphincsshake256ssimple`
Expand Down
7 changes: 6 additions & 1 deletion oqs-template/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ def get_sig_nistlevel(family, alg):
# hacks to match names
def matches(name, alg):
def simplify(s):
return s.lower().replace('_', '').replace('-', '').replace('+', '')
s = s.lower().replace('_', '').replace('-', '').replace('+', '')
trigpolynom marked this conversation as resolved.
Show resolved Hide resolved
with_index = s.find("with") # Find the index of the "with" sequence
if with_index != -1: # If "with" is found
return s[:with_index] # Return the substring before "with"
else:
return s # Return the original string if "with" is not found
if simplify(name) == simplify(alg['name']): return True
return False
# find the variant that matches
Expand Down
Loading