-
-
Notifications
You must be signed in to change notification settings - Fork 643
proof: implement MTCProof #8907
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.
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
Merged
+567
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,250 @@ | ||
| // Package proof implements the MTCProof and SubtreeSignature types from | ||
| // https://ietf-plants-wg.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html#name-certificate-format. | ||
| // | ||
| // These are used to generate the signature field of MTCs. | ||
| package proof | ||
|
|
||
| import ( | ||
| "bytes" | ||
| encoding_asn1 "encoding/asn1" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "slices" | ||
|
|
||
| "golang.org/x/crypto/cryptobyte" | ||
| "golang.org/x/crypto/cryptobyte/asn1" | ||
| "golang.org/x/mod/sumdb/tlog" | ||
| ) | ||
|
|
||
| var idAlgMTCProofExperimental = encoding_asn1.ObjectIdentifier{1, 3, 6, 1, 4, 1, 44363, 47, 0} | ||
|
|
||
| // SigAlgEncoded returns a DER-encoded AlgorithmIdentifier suitable for | ||
| // use with MTCProof signatures. Currently it returns 1.3.6.1.4.1.44363.47.0, | ||
| // per https://ietf-plants-wg.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html#name-certificate-format: | ||
| // | ||
| // "For initial experimentation, early implementations of this design will use the OID 1.3.6.1.4.1.44363.47.0 | ||
| // instead of id-alg-mtcProof." | ||
| // | ||
| // AlgorithmIdentifier is encoded per https://www.rfc-editor.org/info/rfc5280/#section-4.1.1.2: | ||
| // | ||
| // AlgorithmIdentifier ::= SEQUENCE { | ||
| // algorithm OBJECT IDENTIFIER, | ||
| // parameters ANY DEFINED BY algorithm OPTIONAL } | ||
| func SigAlgEncoded() []byte { | ||
| var builder cryptobyte.Builder | ||
| builder.AddASN1(asn1.SEQUENCE, func(sigAlg *cryptobyte.Builder) { | ||
| sigAlg.AddASN1ObjectIdentifier(idAlgMTCProofExperimental) | ||
| }) | ||
| return builder.BytesOrPanic() | ||
| } | ||
|
|
||
| // MTCProof represents the MTCProof structure from | ||
| // https://ietf-plants-wg.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html#name-certificate-format | ||
| // | ||
| // struct { | ||
| // MTCLogEntryExtension extensions<0..2^16-1>; | ||
| // uint48 start; | ||
| // uint48 end; | ||
| // HashValue inclusion_proof<0..2^16-1>; | ||
| // SubtreeSignature signatures<0..2^16-1>; | ||
| // } MTCProof; | ||
| type MTCProof struct { | ||
| Extensions []byte | ||
| Start, End uint64 | ||
| InclusionProof []tlog.Hash | ||
| Signatures []*SubtreeSignature | ||
| } | ||
|
|
||
| // Marshal serializes the bytes of an MTCProof. | ||
| func (m *MTCProof) Marshal() ([]byte, error) { | ||
| var builder cryptobyte.Builder | ||
| builder.AddUint16LengthPrefixed(func(builder *cryptobyte.Builder) { | ||
| builder.AddBytes(m.Extensions) | ||
| }) | ||
|
|
||
| var startBytes, endBytes [8]byte | ||
| binary.BigEndian.PutUint64(startBytes[:], m.Start) | ||
| binary.BigEndian.PutUint64(endBytes[:], m.End) | ||
|
|
||
| if startBytes[0] != 0 || startBytes[1] != 0 { | ||
| return nil, fmt.Errorf("start too big: %d", m.Start) | ||
| } | ||
| if endBytes[0] != 0 || endBytes[1] != 0 { | ||
| return nil, fmt.Errorf("end too big: %d", m.End) | ||
| } | ||
|
|
||
| builder.AddBytes(startBytes[2:]) | ||
| builder.AddBytes(endBytes[2:]) | ||
|
|
||
| builder.AddUint16LengthPrefixed(func(builder *cryptobyte.Builder) { | ||
| for _, h := range m.InclusionProof { | ||
| builder.AddBytes(h[:]) | ||
| } | ||
| }) | ||
|
|
||
| // Elements [of the signatures field] MUST be ordered by cosigner_id. | ||
| signatures := slices.Clone(m.Signatures) | ||
| slices.SortFunc(signatures, func(a, b *SubtreeSignature) int { | ||
| if len(a.CosignerID) != len(b.CosignerID) { | ||
| return len(a.CosignerID) - len(b.CosignerID) | ||
| } | ||
| return bytes.Compare(a.CosignerID, b.CosignerID) | ||
| }) | ||
|
|
||
| var sigBytes [][]byte | ||
| var previousCosignerID []byte | ||
| for _, sig := range signatures { | ||
| // Each element of the signatures field MUST have a unique cosigner_id. | ||
| // Signatures are sorted by cosigner_id, so we can just check the previous one. | ||
| if previousCosignerID != nil && bytes.Equal(sig.CosignerID, previousCosignerID) { | ||
| return nil, fmt.Errorf("duplicate cosigner ID %x", sig.CosignerID) | ||
| } | ||
| previousCosignerID = sig.CosignerID | ||
|
|
||
| sigByte, err := sig.Marshal() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| sigBytes = append(sigBytes, sigByte) | ||
| } | ||
|
|
||
| builder.AddUint16LengthPrefixed(func(builder *cryptobyte.Builder) { | ||
| for _, sb := range sigBytes { | ||
| builder.AddBytes(sb) | ||
| } | ||
| }) | ||
|
|
||
| return builder.Bytes() | ||
| } | ||
|
|
||
| // UnmarshalMTCProof parses the MTCProof structure from | ||
| // https://ietf-plants-wg.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html#certificate-format. | ||
| // | ||
| // The returned structure will have slices that point to the input data. | ||
| func UnmarshalMTCProof(in []byte) (*MTCProof, error) { | ||
| input := cryptobyte.String(in) | ||
| var extensions cryptobyte.String | ||
| if !input.ReadUint16LengthPrefixed(&extensions) { | ||
| return nil, fmt.Errorf("malformed MTCLogEntry extensions") | ||
| } | ||
|
|
||
| var startBytesLower, endBytesLower []byte | ||
| if !input.ReadBytes(&startBytesLower, 6) { | ||
| return nil, fmt.Errorf("malformed start") | ||
| } | ||
| if !input.ReadBytes(&endBytesLower, 6) { | ||
| return nil, fmt.Errorf("malformed end") | ||
| } | ||
|
|
||
| start := binary.BigEndian.Uint64(append([]byte{0, 0}, startBytesLower[:6]...)) | ||
| end := binary.BigEndian.Uint64(append([]byte{0, 0}, endBytesLower[:6]...)) | ||
|
|
||
| var inclusionProofBytes cryptobyte.String | ||
| if !input.ReadUint16LengthPrefixed(&inclusionProofBytes) { | ||
| return nil, fmt.Errorf("malformed inclusion proof") | ||
| } | ||
|
|
||
| var inclusionProof []tlog.Hash | ||
| for !inclusionProofBytes.Empty() { | ||
| var h []byte | ||
| if !inclusionProofBytes.ReadBytes(&h, tlog.HashSize) { | ||
| return nil, fmt.Errorf("malformed hash") | ||
| } | ||
| var hh tlog.Hash | ||
| copy(hh[:], h) | ||
| inclusionProof = append(inclusionProof, hh) | ||
| } | ||
|
|
||
| var signaturesBytes cryptobyte.String | ||
| if !input.ReadUint16LengthPrefixed(&signaturesBytes) { | ||
| return nil, fmt.Errorf("malformed signature bytes") | ||
| } | ||
|
|
||
| if !input.Empty() { | ||
| return nil, fmt.Errorf("trailing bytes") | ||
| } | ||
|
|
||
| var signatures []*SubtreeSignature | ||
| var previousCosignerID cryptobyte.String | ||
| for !signaturesBytes.Empty() { | ||
| var cosignerID cryptobyte.String | ||
| if !signaturesBytes.ReadUint8LengthPrefixed(&cosignerID) { | ||
|
aarongable marked this conversation as resolved.
|
||
| return nil, fmt.Errorf("malformed trustAnchorID") | ||
| } | ||
|
|
||
| if len(cosignerID) == 0 { | ||
| return nil, fmt.Errorf("empty cosigner ID") | ||
| } | ||
|
|
||
| // Each element of the signatures field MUST have a unique cosigner_id. | ||
| if bytes.Equal(previousCosignerID, cosignerID) { | ||
| return nil, fmt.Errorf("duplicate cosigner ID") | ||
| } | ||
|
|
||
| // Elements MUST be ordered by cosigner_id (excluding length prefix) as follows: | ||
| // - Shorter byte strings are ordered before longer byte strings | ||
| // - Byte strings of the same length are ordered lexicographically | ||
| if len(previousCosignerID) > len(cosignerID) { | ||
| return nil, fmt.Errorf("cosigner IDs not ordered") | ||
| } | ||
| if len(previousCosignerID) == len(cosignerID) && | ||
| bytes.Compare(previousCosignerID, cosignerID) > 0 { | ||
| return nil, fmt.Errorf("cosigner IDs not ordered") | ||
| } | ||
| previousCosignerID = cosignerID | ||
|
|
||
| var sig cryptobyte.String | ||
| if !signaturesBytes.ReadUint16LengthPrefixed(&sig) { | ||
| return nil, fmt.Errorf("malformed signature") | ||
| } | ||
|
|
||
| signatures = append(signatures, &SubtreeSignature{ | ||
| CosignerID: cosignerID, | ||
| Signature: sig, | ||
| }) | ||
| } | ||
|
|
||
| return &MTCProof{ | ||
| Extensions: []byte(extensions), | ||
| Start: start, | ||
| End: end, | ||
| InclusionProof: inclusionProof, | ||
| Signatures: signatures, | ||
| }, nil | ||
| } | ||
|
|
||
| // SubtreeSignature represents the struct of that name in | ||
| // https://ietf-plants-wg.github.io/merkle-tree-certs/draft-ietf-plants-merkle-tree-certs.html#name-certificate-format. | ||
| // | ||
| // Standalone certificates carry two or more of these in addition to their inclusion proof. Landmark-relative certificates | ||
| // carry none. | ||
| // | ||
| // /* From Section 4.1 of draft-ietf-tls-trust-anchor-ids */ | ||
| // opaque TrustAnchorID<1..2^8-1>; | ||
| // | ||
| // opaque HashValue[HASH_SIZE]; | ||
| // | ||
| // struct { | ||
| // TrustAnchorID cosigner_id; | ||
| // opaque signature<0..2^16-1>; | ||
| // } SubtreeSignature; | ||
| type SubtreeSignature struct { | ||
| CosignerID []byte | ||
| Signature []byte | ||
| } | ||
|
|
||
| // Marshal serializes the bytes of a SubtreeSignature. | ||
| func (ms *SubtreeSignature) Marshal() ([]byte, error) { | ||
| var builder cryptobyte.Builder | ||
| if len(ms.CosignerID) == 0 { | ||
| // TrustAnchorID is defined as minimum 1 byte. | ||
| return nil, fmt.Errorf("empty cosigner ID") | ||
| } | ||
| builder.AddUint8LengthPrefixed(func(builder *cryptobyte.Builder) { | ||
| builder.AddBytes(ms.CosignerID) | ||
| }) | ||
| builder.AddUint16LengthPrefixed(func(builder *cryptobyte.Builder) { | ||
| builder.AddBytes(ms.Signature) | ||
| }) | ||
| return builder.Bytes() | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.