[WIP] Add PQC support to the Proton branch #231
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is sometimes useful to encrypt data under some symmetric key. While this was possible to do using passphrase-derived keys, there was no support for long-term storage of the keys that was used to encrypt the key packets. To solve this, a new type of key is introduced. This key will hold a symmetric key, and will be used for both encryption and decryption of data. Specifically, as with asymmetric keys, the actual data will be encrypted using a session key, generated ad-hoc for these data. Then, instead of using a public key to encrypt the session key, the persistent symmetric key will be used instead, to produce a, so to say, Key Encrypted Key Packet. Conversly, instead of using a private key to decrypt the session key, the same symmetric key will be used. Then, the decrypted session key can be used to decrypt the data packet, as usual. As with the case of AEAD keys, it is sometimes useful to "sign" data with a persistent, symmetric key. This key holds a symmetric key, which can be used for both signing and verifying the integrity of data. While not strictly needed, the signature process will first generate a digest of the data-to-be-signed, and then the key will be used to sign the digest, using an HMAC construction. For technical reasons, related to this implenetation of the openpgp protocol, the secret key material is also stored in the newly defined public key types. Future contributors must take note of this, and not export or serialize that key in a way that it will be publicly availabe. Since symmetric keys do not have a public and private part, there is no point serializing the internal "public key" structures. Thus, symmetric keys are skipped when serialing the public part of a keyring.
Generate an AEAD subkey when requesting an HMAC primary key.
Squashed commits: Update KDF to use SHA3-256 [5ff62f7] WIP: bump to draft-ietf-openpgp-pqc-01 [3949477] Import CIRCL fork with ML-KEM and ML-DSA [5033a18] Update implementation from draft v1 to v3 - Remove v6 binding for PQC KEMs - Update KDF - Update reference comments - Rename SPHINCS+ to SLH-DSA - Rename Dilithium to ML-DSA - Rename Kyber to ML-KEM - Add vectors generated with RNP - Fix misc bugs and improve tests [c53e2e3] Add benchmarking [d832873] Add read-write tests [8254a42] Bind PQC packets to v6 [21f33d3] Change testdata for Kyber keys and prepare for v6 PKESK [fa295de] Change domain separation [c5bc3c1] Add SPHINCS+ signature support [603ced6] Add references and clean code [9b26049] Prefer PQ keys [6e5ec9c] Add hybrid Kyber + ECDH, Dilithium + EC/EdDSA support
- Update to Fips compliant algorithms
lubux
commented
Sep 23, 2024
lubux
commented
Sep 24, 2024
wussler
reviewed
Sep 25, 2024
|
|
||
| // buildKey implements the composite KDF as specified in | ||
| // https://www.ietf.org/archive/id/draft-ietf-openpgp-pqc-04.html#name-key-combiner | ||
| func buildKey(pub *PublicKey, eccSecretPoint, eccEphemeral, eccPublicKey, mlkemKeyShare, mlkemEphemeral []byte, mlkemPublicKey kem.PublicKey) ([]byte, error) { |
There was a problem hiding this comment.
This is also about to be updated, I'd wait to merge until it's ready
openpgp/packet/public_key.go
Outdated
| @@ -1209,6 +1347,9 @@ func (pk *PublicKey) BitLength() (bitLength uint16, err error) { | |||
| bitLength = ed448.PublicKeySize * 8 | |||
| case ExperimentalPubKeyAlgoAEAD: | |||
| bitLength = 32 | |||
| case PubKeyAlgoMlkem768X25519, PubKeyAlgoMlkem1024X448, PubKeyAlgoMldsa65Ed25519, | |||
| PubKeyAlgoMldsa87Ed448: | |||
| bitLength = pk.q.BitLength() // Very questionable | |||
There was a problem hiding this comment.
This should be discussed before we merge it
openpgp/v2/pqc_vectors_test.go
Outdated
| dumpTestVector(t, filename, serializedArmoredMessage.String()) | ||
| } | ||
|
|
||
| func TestV4EddsaPqKey(t *testing.T) { |
There was a problem hiding this comment.
This file is to be completely re-adapted (I commented out some code to generate the vectors), definitely not ready for merge
There was a problem hiding this comment.
I removed the test vector generator files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds PQC support to the Proton branch.
https://datatracker.ietf.org/doc/draft-ietf-openpgp-pqc/
TODO: