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

Experimental KEMTLS Client #20

Draft
wants to merge 4 commits into
base: dev/tls-13
Choose a base branch
from
Draft

Experimental KEMTLS Client #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd132e4
add twiggers' OIDs for Kyber key loading
reneme Jun 13, 2022
47d9804
KEMTLS as spoken by thomwigger/kemtls-experiment
reneme Jun 13, 2022
6e50cd9
Dilithium (squashed PR #2973)
boricm May 5, 2022
8742b63
allow using Dilithium for certificate signatures (OIDs by twiggers)
reneme Jun 13, 2022
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
7 changes: 7 additions & 0 deletions src/build-data/oids.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@
1.3.6.1.4.1.2.267.10.3.3 = Kyber-768-90s-r3
1.3.6.1.4.1.2.267.10.4.4 = Kyber-1024-90s-r3

# Dilithium OIDs are based on the following internet draft
# https://www.ietf.org/id/draft-uni-qsckeys-00.html#section-7.1
# Dilithium AES modes are not (yet) defined in the list.
1.3.6.1.4.1.2.267.7.4.4 = Dilithium-4x4-r3
1.3.6.1.4.1.2.267.7.6.5 = Dilithium-6x5-r3
1.3.6.1.4.1.2.267.7.8.7 = Dilithium-8x7-r3

# XMSS
1.3.6.1.4.1.25258.1.5 = XMSS-draft6
1.3.6.1.4.1.25258.1.8 = XMSS-draft12
Expand Down
15 changes: 14 additions & 1 deletion src/lib/asn1/oid_maps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* OID maps
*
* This file was automatically generated by src/scripts/oids.py on 2022-01-10
* This file was automatically generated by src\scripts\oids.py on 2022-05-05
*
* All manual edits to this file will be lost. Edit the script
* then regenerate this source file.
Expand Down Expand Up @@ -141,6 +141,16 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map()
{ "1.3.6.1.4.1.2.267.10.2.2", "Kyber-512-90s-r3" },
{ "1.3.6.1.4.1.2.267.10.3.3", "Kyber-768-90s-r3" },
{ "1.3.6.1.4.1.2.267.10.4.4", "Kyber-1024-90s-r3" },
{ "1.3.6.1.4.1.2.267.7.4.4", "Dilithium-4x4-r3" },
{ "1.3.6.1.4.1.2.267.7.6.5", "Dilithium-6x5-r3" },
{ "1.3.6.1.4.1.2.267.7.8.7", "Dilithium-8x7-r3" },

// TODO: those OIDs are taken from thomwiggers/mk-cert for interoperability
// https://github.com/thomwiggers/mk-cert/blob/dd845f3825d8dc5fd69e0e234f6a62266ee4dd4a/algorithms.py#L84
{ "1.3.6.1.4.1.44363.46.1", "Dilithium-4x4-r3" },
{ "1.3.6.1.4.1.44363.46.2", "Dilithium-6x5-r3" },
{ "1.3.6.1.4.1.44363.46.3", "Dilithium-8x7-r3" },

{ "1.3.6.1.4.1.2.267.8.2.2", "Kyber-512-r3" },
{ "1.3.6.1.4.1.2.267.8.3.3", "Kyber-768-r3" },
{ "1.3.6.1.4.1.2.267.8.4.4", "Kyber-1024-r3" },
Expand Down Expand Up @@ -313,6 +323,9 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map()
{ "DSA/EMSA1(SHA-3(512))", OID({2,16,840,1,101,3,4,3,8}) },
{ "DSA/EMSA1(SHA-384)", OID({2,16,840,1,101,3,4,3,3}) },
{ "DSA/EMSA1(SHA-512)", OID({2,16,840,1,101,3,4,3,4}) },
{ "Dilithium-4x4-r3", OID({1,3,6,1,4,1,2,267,7,4,4}) },
{ "Dilithium-6x5-r3", OID({1,3,6,1,4,1,2,267,7,6,5}) },
{ "Dilithium-8x7-r3", OID({1,3,6,1,4,1,2,267,7,8,7}) },
{ "ECDH", OID({1,3,132,1,12}) },
{ "ECDSA", OID({1,2,840,10045,2,1}) },
{ "ECDSA/EMSA1(SHA-160)", OID({1,2,840,10045,4,1}) },
Expand Down
Loading