From 1e48fd35ffbcfedd8e4bec1263f9bace963d3b3c Mon Sep 17 00:00:00 2001 From: Ying Li Date: Mon, 22 Feb 2016 15:27:53 -0800 Subject: [PATCH] Use ToSigned in the swizzler Signed-off-by: Ying Li --- tuf/testutils/swizzler.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tuf/testutils/swizzler.go b/tuf/testutils/swizzler.go index 7f501b0d8c..b790b809a4 100644 --- a/tuf/testutils/swizzler.go +++ b/tuf/testutils/swizzler.go @@ -559,11 +559,10 @@ func (m *MetadataSwizzler) MutateRoot(mutate func(*data.Root)) error { mutate(&root) - rootBytes, err := json.MarshalCanonical(root) + signedThing, err = data.SignedRoot{Signed: root, Signatures: signedThing.Signatures}.ToSigned() if err != nil { return err } - signedThing.Signed = json.RawMessage(rootBytes) 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 @@ -592,11 +591,10 @@ func (m *MetadataSwizzler) MutateTimestamp(mutate func(*data.Timestamp)) error { mutate(×tamp) - timestampBytes, err := json.MarshalCanonical(timestamp) + signedThing, err = data.SignedTimestamp{Signed: timestamp, Signatures: signedThing.Signatures}.ToSigned() if err != nil { return err } - signedThing.Signed = json.RawMessage(timestampBytes) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTimestampRole) if err != nil { @@ -625,11 +623,10 @@ func (m *MetadataSwizzler) MutateSnapshot(mutate func(*data.Snapshot)) error { mutate(&snapshot) - snapshotBytes, err := json.MarshalCanonical(snapshot) + signedThing, err = data.SignedSnapshot{Signed: snapshot, Signatures: signedThing.Signatures}.ToSigned() if err != nil { return err } - signedThing.Signed = json.RawMessage(snapshotBytes) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalSnapshotRole) if err != nil { @@ -658,11 +655,10 @@ func (m *MetadataSwizzler) MutateTargets(mutate func(*data.Targets)) error { mutate(&targets) - targetsBytes, err := json.MarshalCanonical(targets) + signedThing, err = data.SignedTargets{Signed: targets, Signatures: signedThing.Signatures}.ToSigned() if err != nil { return err } - signedThing.Signed = json.RawMessage(targetsBytes) pubKeys, err := getPubKeys(m.CryptoService, signedThing, data.CanonicalTargetsRole) if err != nil {