docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ToSigned in the swizzler 

Signed-off-by: Ying Li <ying.li@docker.com>
This commit is contained in:
Ying Li 2016-02-22 15:27:53 -08:00
parent b8866877b0
commit 1e48fd35ff
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tuf/testutils/swizzler.go
View File

@ -559,11 +559,10 @@ func (m *MetadataSwizzler) MutateRoot(mutate func(*data.Root)) error {
mutate(&root) mutate(&root)
rootBytes, err := json.MarshalCanonical(root) signedThing, err = data.SignedRoot{Signed: root, Signatures: signedThing.Signatures}.ToSigned()
if err != nil { if err != nil {
return err return err
} }
signedThing.Signed = json.RawMessage(rootBytes)
pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalRootRole) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalRootRole)
if err != nil || len(pubKeys) == 0 { // we have to sign it somehow - might as well use the old keys if err != nil || len(pubKeys) == 0 { // we have to sign it somehow - might as well use the old keys
@ -592,11 +591,10 @@ func (m *MetadataSwizzler) MutateTimestamp(mutate func(*data.Timestamp)) error {
mutate(&timestamp) mutate(&timestamp)
timestampBytes, err := json.MarshalCanonical(timestamp) signedThing, err = data.SignedTimestamp{Signed: timestamp, Signatures: signedThing.Signatures}.ToSigned()
if err != nil { if err != nil {
return err return err
} }
signedThing.Signed = json.RawMessage(timestampBytes)
pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTimestampRole) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTimestampRole)
if err != nil { if err != nil {
@ -625,11 +623,10 @@ func (m *MetadataSwizzler) MutateSnapshot(mutate func(*data.Snapshot)) error {
mutate(&snapshot) mutate(&snapshot)
snapshotBytes, err := json.MarshalCanonical(snapshot) signedThing, err = data.SignedSnapshot{Signed: snapshot, Signatures: signedThing.Signatures}.ToSigned()
if err != nil { if err != nil {
return err return err
} }
signedThing.Signed = json.RawMessage(snapshotBytes)
pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalSnapshotRole) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalSnapshotRole)
if err != nil { if err != nil {
@ -658,11 +655,10 @@ func (m *MetadataSwizzler) MutateTargets(mutate func(*data.Targets)) error {
mutate(&targets) mutate(&targets)
targetsBytes, err := json.MarshalCanonical(targets) signedThing, err = data.SignedTargets{Signed: targets, Signatures: signedThing.Signatures}.ToSigned()
if err != nil { if err != nil {
return err return err
} }
signedThing.Signed = json.RawMessage(targetsBytes)
pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTargetsRole) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTargetsRole)
if err != nil { if err != nil {