openpgp: add RevokeKey, RevokeSubkey, AddSigningSubkey and AddEncryptionSubkey methods to Entity #53
Conversation
This file contains hidden or 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
The existing implementation does not support operations on subkeys using the library, so the following changes have been made to support subkey interactions as per RFC 4880 (https://tools.ietf.org/html/rfc4880). 1. AddSubkey adds support for generating new subkeys associated with an Entity. It also adds support for adding signing subkeys. 2. RevokeKey generates a 0x20 key revocation signature against the entity. 3. RevokeSubkey generates a 0x28 subkey revocation signature for a subkey. 4. Add Revocation reason subpacket and EmbeddedSignature subpacket to output subpackets with corresponding tests. 5. Re-sign the embedded signatures for subkeys in entity.SerializePrivate(). Fixes golang/go#29301 Change-Id: If8ee111e825c17ccaa19e4afbac4a756671d9bf5
Having a subkey which supports both is not recommended. Also, add support for adding ECC subkeys. Also, fix adding RSA subkeys to ECC keys, and vice versa.
zugzwang
reviewed
May 29, 2020
openpgp/key_generation.go
Outdated
Comment on lines
134
to
162
| subkey := Subkey{ | ||
| PublicKey: &sub.PublicKey, | ||
| PrivateKey: sub, | ||
| Sig: &packet.Signature{ | ||
| CreationTime: creationTime, | ||
| SigType: packet.SigTypeSubkeyBinding, | ||
| PubKeyAlgo: e.PrimaryKey.PubKeyAlgo, | ||
| Hash: config.Hash(), | ||
| FlagsValid: true, | ||
| FlagSign: true, | ||
| IssuerKeyId: &e.PrimaryKey.KeyId, | ||
| }, | ||
| } | ||
|
|
||
| embeddedSig := &packet.Signature{ | ||
| CreationTime: creationTime, | ||
| SigType: packet.SigTypePrimaryKeyBinding, | ||
| PubKeyAlgo: subkey.PublicKey.PubKeyAlgo, | ||
| Hash: config.Hash(), | ||
| IssuerKeyId: &e.PrimaryKey.KeyId, | ||
| } | ||
| err = embeddedSig.CrossSignKey(subkey.PublicKey, e.PrimaryKey, subkey.PrivateKey, config) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| subkey.Sig.EmbeddedSignature = embeddedSig | ||
|
|
||
| subkey.PublicKey.IsSubkey = true | ||
| subkey.PrivateKey.IsSubkey = true |
There was a problem hiding this comment.
In the end, embeddedSig.PubkeyAlgo depends on subkey and subkey depends on embeddedSig. They are just values but looks circular.
Maybe create first embeddedSig (and use e.g. config.PublicKeyAlgorithm()) and then simply set
EmbeddedSignature: &embeddedSig
or something similar when defining subkey?
There was a problem hiding this comment.
Yeah, good point. I've inlined the embedded signature creation into the subkey creation, to still keep the packet order but fix the circularity.
The spec doesn't say it must appear in the hashed area, unlike the creation time subpacket.
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.
This PR is adapted from @syadav2015's CL here: https://go-review.googlesource.com/c/crypto/+/161817/
This PR is on top of #50.