squash! keydata, crypt: fix and refactor tests for legacy keys

copy MarshalKeys to MarshalV1Keys which is now used only for legacy
tests. MarshalKeys will be completely removed after the changes
to the tpm platform which still use it.

export_test.go

@@ -22,6 +22,7 @@ package secboot
 import (
 	"bytes"
 	"crypto"
+	"encoding/binary"
 	"encoding/json"
 	"io"
 	"math/rand"
@@ -151,6 +152,17 @@ func MockReadKeyData(version int) (restore func()) {
 	}
 }
 
+// MarshalV1Keys serializes the supplied disk unlock key and auxiliary key in
+// the v1 format that is ready to be encrypted by a platform's secure device.
+func MarshalV1Keys(key DiskUnlockKey, auxKey PrimaryKey) []byte {
+	w := new(bytes.Buffer)
+	binary.Write(w, binary.BigEndian, uint16(len(key)))
+	w.Write(key)
+	binary.Write(w, binary.BigEndian, uint16(len(auxKey)))
+	w.Write(auxKey)
+	return w.Bytes()
+}
+
 // MockMakeDiskUnlockKey uses the new keydata API but creates v1 keydata payloads.
 func MockMakeDiskUnlockKey(primaryKey PrimaryKey) (func(), error) {
 	origMakeDiskUnlockKey := MakeDiskUnlockKey
@@ -170,7 +182,7 @@ func MockMakeDiskUnlockKey(primaryKey PrimaryKey) (func(), error) {
 			return nil, nil, err
 		}
 
-		clearTextPayload = MarshalKeys(unlockKey, primaryKey)
+		clearTextPayload = MarshalV1Keys(unlockKey, primaryKey)
 		return unlockKey, clearTextPayload, err
 	}
 	return func() {

keydata_test.go

@@ -688,7 +688,7 @@ func (s *keyDataSuite) TestKeyPayloadUnmarshalInvalid1(c *C) {
 func (s *keyDataSuite) TestKeyPayloadUnmarshalInvalid2(c *C) {
 
 	if s.Version == 1 {
-		payload := MarshalKeys(make(DiskUnlockKey, 32), make(PrimaryKey, 32))
+		payload := MarshalV1Keys(make(DiskUnlockKey, 32), make(PrimaryKey, 32))
 		payload = append(payload, 0xff)
 
 		key, auxKey, err := UnmarshalV1KeyPayload(payload)
@@ -1724,7 +1724,7 @@ func (s *keyDataLegacySuite) testKeyPayload(c *C, data *testKeyPayloadData) {
 	unlockKey := data.unique
 	primaryKey := data.primary
 
-	payload := MarshalKeys(unlockKey, primaryKey)
+	payload := MarshalV1Keys(unlockKey, primaryKey)
 
 	key, auxKey, err := UnmarshalV1KeyPayload(payload)
 	c.Check(err, IsNil)