Repository: scionproto/scion
Pull request #3549 (2019-12-20 09:13:13)

CPPKI: Do not double base64 encode
We use the JWS standard that prescribes that the payload and protected
metadata must be encoded as base 64 raw url safe encoding.

In the go code, we have typed byte slices with respective encode and
decode functions because the json library only allows using the standard
base64 encoding.

Helpfully, when calling json.{Unm,M}arshal, byte slices are encoded in
base64 automatically. Which results in double encoding in our case.

This PR changes the encoded types to string types to prevent the
json library from encoding the data.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/scionproto/scion/3549)
<!-- Reviewable:end -->



Patch:
diff --git a/go/lib/infra/modules/trust/v2/trustdbsqlite/db.go b/go/lib/infra/modules/trust/v2/trustdbsqlite/db.go
index ae700d13a..02923dbe1 100644
--- a/go/lib/infra/modules/trust/v2/trustdbsqlite/db.go
+++ b/go/lib/infra/modules/trust/v2/trustdbsqlite/db.go
@@ -219,7 +219,7 @@ func (e *executor) InsertTRC(ctx context.Context, d decoded.TRC) (bool, error) {
 	e.Lock()
 	defer e.Unlock()
 
-	h := hash(d.Signed.EncodedTRC)
+	h := hash([]byte(d.Signed.EncodedTRC))
 	query := `INSERT INTO trcs (isd_id, version, raw, pld, pld_hash, not_before,
 	          not_after, grace_period) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`
 	var inserted bool
@@ -274,7 +274,7 @@ func (e *executor) InsertChain(ctx context.Context, d decoded.Chain) (bool, bool
 	e.Lock()
 	defer e.Unlock()
 
-	asHash, issHash := hash(d.Chain.AS.Encoded), hash(d.Chain.Issuer.Encoded)
+	asHash, issHash := hash([]byte(d.Chain.AS.Encoded)), hash([]byte(d.Chain.Issuer.Encoded))
 	var asInserted, issInserted bool
 	err := db.DoInTx(ctx, e.db, func(ctx context.Context, tx *sql.Tx) error {
 		exists, err := chainExists(ctx, tx, d)
@@ -316,7 +316,7 @@ func insertIssuer(ctx context.Context, db db.Sqler, iss *cert.Issuer,
 		return false, nil
 	}
 	_, err = db.ExecContext(ctx, query, iss.Subject.I, iss.Subject.A, iss.Version, signed.Encoded,
-		hash(signed.Encoded), signed.EncodedProtected, signed.Signature)
+		hash([]byte(signed.Encoded)), signed.EncodedProtected, signed.Signature)
 	if err != nil {
 		return false, err
 	}
@@ -332,7 +332,7 @@ func trcExists(ctx context.Context, db db.Sqler, d decoded.TRC) (bool, error) {
 		return false, nil
 	case err != nil:
 		return false, err
-	case !bytes.Equal(hash(d.Signed.EncodedTRC), dbHash):
+	case !bytes.Equal(hash([]byte(d.Signed.EncodedTRC)), dbHash):
 		return true, trust.ErrContentMismatch
 	default:
 		return true, nil
@@ -349,9 +349,9 @@ func chainExists(ctx context.Context, db db.Sqler, d decoded.Chain) (bool, error
 		return false, nil
 	case err != nil:
 		return false, err
-	case !bytes.Equal(hash(d.Chain.AS.Encoded), asHash):
+	case !bytes.Equal(hash([]byte(d.Chain.AS.Encoded)), asHash):
 		return false, serrors.WithCtx(trust.ErrContentMismatch, "part", "as")
-	case !bytes.Equal(hash(d.Chain.Issuer.Encoded), issHash):
+	case !bytes.Equal(hash([]byte(d.Chain.Issuer.Encoded)), issHash):
 		return false, serrors.WithCtx(trust.ErrContentMismatch, "part", "issuer")
 	default:
 		return true, nil
@@ -369,7 +369,7 @@ func issuerExists(ctx context.Context, db db.Sqler, iss *cert.Issuer,
 		return false, nil
 	case err != nil:
 		return false, err
-	case !bytes.Equal(hash(signed.Encoded), dbHash):
+	case !bytes.Equal(hash([]byte(signed.Encoded)), dbHash):
 		return false, trust.ErrContentMismatch
 	default:
 		return true, nil
diff --git a/go/lib/scrypto/BUILD.bazel b/go/lib/scrypto/BUILD.bazel
index b2bff168a..59650217e 100644
--- a/go/lib/scrypto/BUILD.bazel
+++ b/go/lib/scrypto/BUILD.bazel
@@ -29,6 +29,7 @@ go_test(
     name = "go_default_test",
     srcs = [
         "asym_test.go",
+        "defs_test.go",
         "keymeta_test.go",
         "rand_test.go",
         "validity_test.go",
diff --git a/go/lib/scrypto/asym.go b/go/lib/scrypto/asym.go
index ca0dec350..9b58ffd4b 100644
--- a/go/lib/scrypto/asym.go
+++ b/go/lib/scrypto/asym.go
@@ -95,13 +95,13 @@ func GetPubKey(privKey []byte, algo string) ([]byte, error) {
 
 // Sign takes a signature input and a signing key to create a signature. Currently only
 // ed25519 is supported.
-func Sign(sigInput, signKey common.RawBytes, signAlgo string) (common.RawBytes, error) {
+func Sign(sigInput, signKey []byte, signAlgo string) ([]byte, error) {
 	switch strings.ToLower(signAlgo) {
 	case Ed25519:
 		switch len(signKey) {
 		case ed25519.PrivateKeySize:
 		case ed25519.SeedSize:
-			signKey = common.RawBytes(ed25519.NewKeyFromSeed(signKey))
+			signKey = ed25519.NewKeyFromSeed(signKey)
 		default:
 			return nil, serrors.WithCtx(ErrInvalidPrivKeySize, "expected", ed25519.PrivateKeySize,
 				"actual", len(signKey))
@@ -114,7 +114,7 @@ func Sign(sigInput, signKey common.RawBytes, signAlgo string) (common.RawBytes,
 
 // Verify takes a signature input and a verifying key and returns an error, if the
 // signature does not match. Currently only ed25519 is supported.
-func Verify(sigInput, sig, verifyKey common.RawBytes, signAlgo string) error {
+func Verify(sigInput, sig, verifyKey []byte, signAlgo string) error {
 	switch strings.ToLower(signAlgo) {
 	case Ed25519:
 		if len(verifyKey) != ed25519.PublicKeySize {
@@ -140,7 +140,7 @@ func Verify(sigInput, sig, verifyKey common.RawBytes, signAlgo string) error {
 // Encrypt takes a message, a nonce and a public/private keypair and
 // returns the encrypted and authenticated message.
 // Note: Nonce must be different for each message that is encrypted with the same key.
-func Encrypt(msg, nonce, pubkey, privkey common.RawBytes, algo string) (common.RawBytes, error) {
+func Encrypt(msg, nonce, pubkey, privkey []byte, algo string) ([]byte, error) {
 	switch strings.ToLower(algo) {
 	case Curve25519xSalsa20Poly1305:
 		nonceRaw, pubKeyRaw, privKeyRaw, err := prepNaClBox(nonce, pubkey, privkey)
@@ -154,7 +154,7 @@ func Encrypt(msg, nonce, pubkey, privkey common.RawBytes, algo string) (common.R
 }
 
 // Decrypt decrypts a message for a given nonce and public/private keypair.
-func Decrypt(msg, nonce, pubkey, privkey common.RawBytes, algo string) (common.RawBytes, error) {
+func Decrypt(msg, nonce, pubkey, privkey []byte, algo string) ([]byte, error) {
 	switch strings.ToLower(algo) {
 	case Curve25519xSalsa20Poly1305:
 		nonceRaw, pubKeyRaw, privKeyRaw, err := prepNaClBox(nonce, pubkey, privkey)
diff --git a/go/lib/scrypto/cert/v2/as_signed.go b/go/lib/scrypto/cert/v2/as_signed.go
index 5bfdeb4a0..f6bc1fb91 100644
--- a/go/lib/scrypto/cert/v2/as_signed.go
+++ b/go/lib/scrypto/cert/v2/as_signed.go
@@ -29,32 +29,33 @@ import (
 var ErrIANotSet = errors.New("ia not set")
 
 type SignedAS struct {
-	Encoded          EncodedAS          `json:"payload"`
-	EncodedProtected EncodedProtectedAS `json:"protected"`
-	Signature        common.RawBytes    `json:"signature"`
+	Encoded          EncodedAS           `json:"payload"`
+	EncodedProtected EncodedProtectedAS  `json:"protected"`
+	Signature        scrypto.JWSignature `json:"signature"`
 }
 
 // SigInput computes the signature input according to rfc7517 (see:
 // https://tools.ietf.org/html/rfc7515#section-5.1)
-func (s SignedAS) SigInput() common.RawBytes {
-	return scrypto.JWSignatureInput(s.EncodedProtected, s.Encoded)
+func (s SignedAS) SigInput() []byte {
+	return scrypto.JWSignatureInput(string(s.EncodedProtected), string(s.Encoded))
 }
 
-// EncodedAS is the the base64url encoded marshaled AS certificate.
-type EncodedAS []byte
+// EncodedAS is the the base64url encoded marshaled AS certificate. It is a
+// string type to prevent json.Marshal from encoding it to base64 a second time.
+type EncodedAS string
 
 // EncodeAS encodes and returns the packed AS certificate.
 func EncodeAS(c *AS) (EncodedAS, error) {
 	b, err := json.Marshal(c)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return EncodedAS(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode returns the decoded Decode.
-func (p *EncodedAS) Decode() (*AS, error) {
-	b, err := scrypto.Base64.DecodeString(string(*p))
+func (p EncodedAS) Decode() (*AS, error) {
+	b, err := scrypto.Base64.DecodeString(string(p))
 	if err != nil {
 		return nil, err
 	}
@@ -65,22 +66,23 @@ func (p *EncodedAS) Decode() (*AS, error) {
 	return &c, nil
 }
 
-// EncodedProtectedAS is the base64url encoded utf-8 metadata.
-type EncodedProtectedAS []byte
+// EncodedProtectedAS is the base64url encoded utf-8 metadata. It is a string
+// type to prevent json.Marshal from encoding it to base64 a second time.
+type EncodedProtectedAS string
 
 // EncodeProtectedAS encodes the protected header.
 func EncodeProtectedAS(p ProtectedAS) (EncodedProtectedAS, error) {
 	// json.Marshal forces the necessary utf-8 encoding.
 	b, err := json.Marshal(p)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return EncodedProtectedAS(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode decodes and return the protected header.
-func (h *EncodedProtectedAS) Decode() (ProtectedAS, error) {
-	b, err := scrypto.Base64.DecodeString(string(*h))
+func (h EncodedProtectedAS) Decode() (ProtectedAS, error) {
+	b, err := scrypto.Base64.DecodeString(string(h))
 	if err != nil {
 		return ProtectedAS{}, err
 	}
diff --git a/go/lib/scrypto/cert/v2/issuer_signed.go b/go/lib/scrypto/cert/v2/issuer_signed.go
index 21e9f7e8d..3979bc6bb 100644
--- a/go/lib/scrypto/cert/v2/issuer_signed.go
+++ b/go/lib/scrypto/cert/v2/issuer_signed.go
@@ -32,13 +32,13 @@ var (
 type SignedIssuer struct {
 	Encoded          EncodedIssuer          `json:"payload"`
 	EncodedProtected EncodedProtectedIssuer `json:"protected"`
-	Signature        common.RawBytes        `json:"signature"`
+	Signature        scrypto.JWSignature    `json:"signature"`
 }
 
 // SigInput computes the signature input according to rfc7517 (see:
 // https://tools.ietf.org/html/rfc7515#section-5.1)
-func (s SignedIssuer) SigInput() common.RawBytes {
-	return scrypto.JWSignatureInput(s.EncodedProtected, s.Encoded)
+func (s SignedIssuer) SigInput() []byte {
+	return scrypto.JWSignatureInput(string(s.EncodedProtected), string(s.Encoded))
 }
 
 // ParseSignedIssuer parses the raw signed issuer certificate.
@@ -55,21 +55,23 @@ func EncodeSignedIssuer(signed SignedIssuer) ([]byte, error) {
 	return json.Marshal(signed)
 }
 
-// EncodedIssuer is the the base64url encoded marshaled issuer certificate.
-type EncodedIssuer []byte
+// EncodedIssuer is the the base64url encoded marshaled issuer certificate. It
+// is a string type to prevent json.Marshal from encoding it to base64 a second
+// time.
+type EncodedIssuer string
 
 // EncodeIssuer encodes and returns the packed issuer certificate.
 func EncodeIssuer(c *Issuer) (EncodedIssuer, error) {
 	b, err := json.Marshal(c)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return EncodedIssuer(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode returns the decoded Decode.
-func (p *EncodedIssuer) Decode() (*Issuer, error) {
-	b, err := scrypto.Base64.DecodeString(string(*p))
+func (p EncodedIssuer) Decode() (*Issuer, error) {
+	b, err := scrypto.Base64.DecodeString(string(p))
 	if err != nil {
 		return nil, err
 	}
@@ -80,22 +82,23 @@ func (p *EncodedIssuer) Decode() (*Issuer, error) {
 	return &c, nil
 }
 
-// EncodedProtectedIssuer is the base64url encoded utf-8 metadata.
-type EncodedProtectedIssuer []byte
+// EncodedProtectedIssuer is the base64url encoded utf-8 metadata. It is a
+// string type to prevent json.Marshal from encoding it to base64 a second time.
+type EncodedProtectedIssuer string
 
 // EncodeProtectedIssuer encodes the protected header.
 func EncodeProtectedIssuer(p ProtectedIssuer) (EncodedProtectedIssuer, error) {
 	// json.Marshal forces the necessary utf-8 encoding.
 	b, err := json.Marshal(p)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return EncodedProtectedIssuer(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode decodes and return the protected header.
-func (h *EncodedProtectedIssuer) Decode() (ProtectedIssuer, error) {
-	b, err := scrypto.Base64.DecodeString(string(*h))
+func (h EncodedProtectedIssuer) Decode() (ProtectedIssuer, error) {
+	b, err := scrypto.Base64.DecodeString(string(h))
 	if err != nil {
 		return ProtectedIssuer{}, err
 	}
diff --git a/go/lib/scrypto/defs.go b/go/lib/scrypto/defs.go
index 6f3b9b181..e5867bff0 100644
--- a/go/lib/scrypto/defs.go
+++ b/go/lib/scrypto/defs.go
@@ -28,10 +28,32 @@ var Base64 = base64.RawURLEncoding
 
 // JWSignatureInput computes the signature input according to rfc7517 (see:
 // https://tools.ietf.org/html/rfc7515#section-5.1)
-func JWSignatureInput(protected []byte, payload []byte) common.RawBytes {
+func JWSignatureInput(protected string, payload string) common.RawBytes {
 	input := make([]byte, len(protected)+len(payload)+1)
 	copy(input[:len(protected)], protected)
 	input[len(protected)] = '.'
 	copy(input[len(protected)+1:], payload)
 	return input
 }
+
+// JWSignature uses the encoding in accordance with rfc7515 when packing and
+// unpacking signatures.
+type JWSignature []byte
+
+// UnmarshalText parses the base64url encoded bytes.
+func (s *JWSignature) UnmarshalText(b []byte) error {
+	buf := make([]byte, Base64.DecodedLen(len(b)))
+	n, err := Base64.Decode(buf, b)
+	if err != nil {
+		return err
+	}
+	*s = buf[:n]
+	return nil
+}
+
+// MarshalText returns the base64url encoded bytes
+func (s JWSignature) MarshalText() ([]byte, error) {
+	b := make([]byte, Base64.EncodedLen(len(s)))
+	Base64.Encode(b, s)
+	return b, nil
+}
diff --git a/go/lib/scrypto/trc/v2/signed.go b/go/lib/scrypto/trc/v2/signed.go
index 4b8c2922c..a4653cbee 100644
--- a/go/lib/scrypto/trc/v2/signed.go
+++ b/go/lib/scrypto/trc/v2/signed.go
@@ -65,16 +65,17 @@ func EncodeSigned(signed Signed) ([]byte, error) {
 	return json.Marshal(signed)
 }
 
-// Encoded is the the base64url encoded marshaled TRC.
-type Encoded []byte
+// Encoded is the the base64url encoded marshaled TRC. It is a string type to
+// prevent json.Marshal from encoding it to base64 a second time.
+type Encoded string
 
 // Encode encodes and returns the packed TRC.
 func Encode(trc *TRC) (Encoded, error) {
 	b, err := json.Marshal(trc)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return Encoded(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode returns the decoded Decode.
@@ -92,21 +93,22 @@ func (p Encoded) Decode() (*TRC, error) {
 
 // Signature contains the signature and packed metadata for one single key.
 type Signature struct {
-	EncodedProtected EncodedProtected `json:"protected"`
-	Signature        []byte           `json:"signature"`
+	EncodedProtected EncodedProtected    `json:"protected"`
+	Signature        scrypto.JWSignature `json:"signature"`
 }
 
-// EncodedProtected is the base64url encoded utf-8 metadata.
-type EncodedProtected []byte
+// EncodedProtected is the base64url encoded utf-8 metadata. It is a string type to
+// prevent json.Marshal from encoding it to base64 a second time.
+type EncodedProtected string
 
 // EncodeProtected encodes the protected header.
 func EncodeProtected(p Protected) (EncodedProtected, error) {
 	// json.Marshal forces the necessary utf-8 encoding.
 	b, err := json.Marshal(p)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
-	return []byte(scrypto.Base64.EncodeToString(b)), nil
+	return EncodedProtected(scrypto.Base64.EncodeToString(b)), nil
 }
 
 // Decode decodes and return the protected header.
@@ -244,5 +246,5 @@ func (Crit) MarshalJSON() ([]byte, error) {
 // SigInput computes the signature input according to rfc7517 (see:
 // https://tools.ietf.org/html/rfc7515#section-5.1)
 func SigInput(protected EncodedProtected, trc Encoded) common.RawBytes {
-	return scrypto.JWSignatureInput(protected, trc)
+	return scrypto.JWSignatureInput(string(protected), string(trc))
 }
diff --git a/go/tools/scion-pki/internal/v2/certs/cmd.go b/go/tools/scion-pki/internal/v2/certs/cmd.go
index 471121e8c..e8122c911 100644
--- a/go/tools/scion-pki/internal/v2/certs/cmd.go
+++ b/go/tools/scion-pki/internal/v2/certs/cmd.go
@@ -108,6 +108,8 @@ var humanCmd = &cobra.Command{
 }
 
 func init() {
+	Cmd.PersistentFlags().Uint64Var(&version, "version", 0,
+		"certificate version (0 indicates newest)")
 	Cmd.AddCommand(genChainCmd)
 	Cmd.AddCommand(genIssuerCmd)
 	Cmd.AddCommand(humanCmd)
diff --git a/go/tools/scion-pki/internal/v2/certs/human.go b/go/tools/scion-pki/internal/v2/certs/human.go
index 96fb20e89..fe2558279 100644
--- a/go/tools/scion-pki/internal/v2/certs/human.go
+++ b/go/tools/scion-pki/internal/v2/certs/human.go
@@ -20,6 +20,7 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/scionproto/scion/go/lib/scrypto"
 	"github.com/scionproto/scion/go/lib/scrypto/cert/v2"
 	"github.com/scionproto/scion/go/lib/serrors"
 )
@@ -85,9 +86,9 @@ func genHumanChain(file string) error {
 }
 
 type decodedCert struct {
-	Payload   interface{} `json:"payload"`
-	Protected interface{} `json:"protected"`
-	Signature []byte      `json:"signature"`
+	Payload   interface{}         `json:"payload"`
+	Protected interface{}         `json:"protected"`
+	Signature scrypto.JWSignature `json:"signature"`
 }
 
 func decodeAS(c *cert.SignedAS) (decodedCert, error) {
diff --git a/go/tools/scion-pki/internal/v2/tmpl/topo.go b/go/tools/scion-pki/internal/v2/tmpl/topo.go
index 1452b8903..c54581fad 100644
--- a/go/tools/scion-pki/internal/v2/tmpl/topo.go
+++ b/go/tools/scion-pki/internal/v2/tmpl/topo.go
@@ -227,7 +227,7 @@ func (g topoGen) genASCerts(topo topoFile) error {
 func (g topoGen) genASCert(ia, issuer addr.IA) conf.AS {
 	sigKey, encKey, revKey := scrypto.KeyVersion(1), scrypto.KeyVersion(1), scrypto.KeyVersion(1)
 	cfg := conf.AS{
-		Description:          fmt.Sprintf("Issuer certificate %s", ia),
+		Description:          fmt.Sprintf("AS certificate %s", ia),
 		Version:              1,
 		SigningKeyVersion:    &sigKey,
 		EncryptionKeyVersion: &encKey,
diff --git a/go/tools/scion-pki/internal/v2/trcs/combine.go b/go/tools/scion-pki/internal/v2/trcs/combine.go
index ffd691c2b..adb52c05c 100644
--- a/go/tools/scion-pki/internal/v2/trcs/combine.go
+++ b/go/tools/scion-pki/internal/v2/trcs/combine.go
@@ -15,7 +15,6 @@
 package trcs
 
 import (
-	"bytes"
 	"os"
 	"path/filepath"
 
@@ -65,7 +64,7 @@ func (c combiner) Combine(protos map[addr.ISD]signedMeta,
 	for isd, proto := range protos {
 		signatures := make(map[trc.Protected]trc.Signature)
 		for fname, part := range parts[isd] {
-			if !bytes.Equal(proto.Signed.EncodedTRC, part.EncodedTRC) {
+			if proto.Signed.EncodedTRC != part.EncodedTRC {
 				pkicmn.QuietPrint("Ignoring signed in %s. Payload is different\n", fname)
 				continue
 			}
diff --git a/go/tools/scion-pki/internal/v2/trcs/human.go b/go/tools/scion-pki/internal/v2/trcs/human.go
index b95de3d3b..720189667 100644
--- a/go/tools/scion-pki/internal/v2/trcs/human.go
+++ b/go/tools/scion-pki/internal/v2/trcs/human.go
@@ -20,6 +20,7 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/scionproto/scion/go/lib/scrypto"
 	"github.com/scionproto/scion/go/lib/scrypto/trc/v2"
 	"github.com/scionproto/scion/go/lib/serrors"
 )
@@ -77,6 +78,6 @@ func parseSignatures(packed []trc.Signature) ([]signature, error) {
 }
 
 type signature struct {
-	Protected trc.Protected `json:"protected"`
-	Signature []byte        `json:"signature"`
+	Protected trc.Protected       `json:"protected"`
+	Signature scrypto.JWSignature `json:"signature"`
 }
diff --git a/go/tools/scion-pki/internal/v2/trcs/util.go b/go/tools/scion-pki/internal/v2/trcs/util.go
index bf09f6a02..ed3165818 100644
--- a/go/tools/scion-pki/internal/v2/trcs/util.go
+++ b/go/tools/scion-pki/internal/v2/trcs/util.go
@@ -83,15 +83,15 @@ func sortSignatures(signatures map[trc.Protected]trc.Signature) []trc.Signature
 func loadTRC(file string) (*trc.TRC, trc.Encoded, error) {
 	raw, err := ioutil.ReadFile(file)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", err
 	}
 	signed, err := trc.ParseSigned(raw)
 	if err != nil {
-		return nil, nil, err
+		return nil, "", err
 	}
 	t, err := signed.EncodedTRC.Decode()
 	if err != nil {
-		return nil, nil, err
+		return nil, "", err
 	}
 	return t, signed.EncodedTRC, nil
 }


Test patch:
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V1.crt b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V1.crt
index 3bb44fb05..bed5f451c 100644
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V1.crt
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V1.crt
@@ -1,1 +1,1 @@
-[{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lJekswbFNhR3AwVkVkTE5rbzJUbkJIYzNGNk0yOWFieXMwTWtsM04wWTNUM2RtSzJ4alV6VndUa2huUFNKOWZTd2lhWE56ZFdWeUlqcDdJblJ5WTE5MlpYSnphVzl1SWpveGZTd2lZMlZ5ZEdsbWFXTmhkR1ZmZEhsd1pTSTZJbWx6YzNWbGNpSjk=","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblJ5WXlJc0luUnlZMTkyWlhKemFXOXVJam94TENKamNtbDBJanBiSW5SNWNHVWlMQ0owY21OZmRtVnljMmx2YmlKZGZR","signature":"zmjtrge2J3PHtPOkf7sLQEkM5O+leN0gbi8rvJRYp9wIFUuh2Y4Ku5LLzGe/awrO9A51Kuza+vK+DDFH3Zv7BA=="},{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKclpYbHpJanA3SW1WdVkzSjVjSFJwYjI0aU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbU4xY25abE1qVTFNVGw0YzJGc2MyRXlNSEJ2YkhreE16QTFJaXdpYTJWNUlqb2lOV2hDYVdoNlRIRTFVRU5ZWmtGRFlUQlZNV1ZTUVdkeFpVTjZhMVUyWW13MU1UQjVXSFl5WkZSc2N6MGlmU3dpY21WMmIyTmhkR2x2YmlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklrOVJVVEZFU0ZwcWJsQjRSR3gxU1ROck1tOU9PVVEwYVNzMVFtZGxibTVoZFdwQlRWcFRXbmhyY0c4OUluMHNJbk5wWjI1cGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpVVkdoYWQxaG9ibkF2Y21keGEzWmtaVzU2YjJOR1RIZENVVTF0UkZGaWNFa3ZVMnhzVFV0eU5FSjNQU0o5ZlN3aWFYTnpkV1Z5SWpwN0ltbGhJam9pTVMxbVpqQXdPakE2TVRFd0lpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUk2TVgwc0ltTmxjblJwWm1sallYUmxYM1I1Y0dVaU9pSmhjeUo5","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpWTNKcGRDSTZXeUowZVhCbElpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUlzSW1saElsMHNJblI1Y0dVaU9pSmpaWEowYVdacFkyRjBaU0lzSW1ObGNuUnBabWxqWVhSbFgzWmxjbk5wYjI0aU9qRXNJbWxoSWpvaU1TMW1aakF3T2pBNk1URXdJbjA=","signature":"8ho+ewCeCReyfiJYJapORS87ajMUB3Jd/fXrYiR0XFdqUycA/gqE4Npd+cQwfup4jWTony4NWf14XRc0qm/PAg=="}]
+[{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJheUpSa2JLcVVUZmluSUxPRkdmVDlaRk5oUEpaVSt1Z1k3TzdJVHNsZFBFPSJ9fSwiaXNzdWVyIjp7InRyY192ZXJzaW9uIjoxfSwiY2VydGlmaWNhdGVfdHlwZSI6Imlzc3VlciJ9","protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InRyYyIsInRyY192ZXJzaW9uIjoxLCJjcml0IjpbInR5cGUiLCJ0cmNfdmVyc2lvbiJdfQ","signature":"duPkuPRbh_q1CVA-NSNTOHS_ROxUSnlRo3IX97uIGwKAeet4s3JVm3A4DhcAoNRWyrWZZGDTk0tfZ3QkJkdLAg"},{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJrZXlzIjp7ImVuY3J5cHRpb24iOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImN1cnZlMjU1MTl4c2Fsc2EyMHBvbHkxMzA1Iiwia2V5IjoiNjkvU1JJV3ZvUHZkcmd0MzNDMWFncTZ0WlZvakk5TldvVlNuU0ZlSXhFOD0ifSwicmV2b2NhdGlvbiI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlM4czdjbWRBVDFucUtuTEJad0kzSi80QmRmTXk4TE96TGhuSEVna1ZjSGs9In0sInNpZ25pbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJUUEQ3Y0NjWEhYc29NNVF3TXc5TUVUa3hJcEtiVkFHaXdvN3pGVW5sM1RBPSJ9fSwiaXNzdWVyIjp7ImlhIjoiMS1mZjAwOjA6MTEwIiwiY2VydGlmaWNhdGVfdmVyc2lvbiI6MX0sImNlcnRpZmljYXRlX3R5cGUiOiJhcyJ9","protected":"eyJhbGciOiJlZDI1NTE5IiwiY3JpdCI6WyJ0eXBlIiwiY2VydGlmaWNhdGVfdmVyc2lvbiIsImlhIl0sInR5cGUiOiJjZXJ0aWZpY2F0ZSIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjEsImlhIjoiMS1mZjAwOjA6MTEwIn0","signature":"VbuJJKj2eKGsVWSG3mha2uOpV-UI047VMPVzOlaiLOmfHCazNtlY51PdkgpHVSb1J_9tFoprOY0L8R7nGTYOCg"}]
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V10.crt b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V10.crt
index c72bad56b..7d685bb30 100644
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V10.crt
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_110-V10.crt
@@ -1,1 +1,1 @@
-[{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lJekswbFNhR3AwVkVkTE5rbzJUbkJIYzNGNk0yOWFieXMwTWtsM04wWTNUM2RtSzJ4alV6VndUa2huUFNKOWZTd2lhWE56ZFdWeUlqcDdJblJ5WTE5MlpYSnphVzl1SWpveGZTd2lZMlZ5ZEdsbWFXTmhkR1ZmZEhsd1pTSTZJbWx6YzNWbGNpSjk=","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblJ5WXlJc0luUnlZMTkyWlhKemFXOXVJam94TENKamNtbDBJanBiSW5SNWNHVWlMQ0owY21OZmRtVnljMmx2YmlKZGZR","signature":"zmjtrge2J3PHtPOkf7sLQEkM5O+leN0gbi8rvJRYp9wIFUuh2Y4Ku5LLzGe/awrO9A51Kuza+vK+DDFH3Zv7BA=="},{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVRBc0ltWnZjbTFoZEY5MlpYSnphVzl1SWpveExDSmtaWE5qY21sd2RHbHZiaUk2SWtsemMzVmxjaUJqWlhKMGFXWnBZMkYwWlNBeExXWm1NREE2TURveE1UQWlMQ0p2Y0hScGIyNWhiRjlrYVhOMGNtbGlkWFJwYjI1ZmNHOXBiblJ6SWpwYlhTd2lkbUZzYVdScGRIa2lPbnNpYm05MFgySmxabTl5WlNJNk1UVTNOVFV6TmpjME5pd2libTkwWDJGbWRHVnlJam94TmpBM01EY3lOelEyZlN3aWEyVjVjeUk2ZXlKbGJtTnllWEIwYVc5dUlqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpqZFhKMlpUSTFOVEU1ZUhOaGJITmhNakJ3YjJ4NU1UTXdOU0lzSW10bGVTSTZJalZvUW1sb2VreHhOVkJEV0daQlEyRXdWVEZsVWtGbmNXVkRlbXRWTm1Kc05URXdlVmgyTW1SVWJITTlJbjBzSW5KbGRtOWpZWFJwYjI0aU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSlBVVkV4UkVoYWFtNVFlRVJzZFVremF6SnZUamxFTkdrck5VSm5aVzV1WVhWcVFVMWFVMXA0YTNCdlBTSjlMQ0p6YVdkdWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pVkZSb1duZFlhRzV3TDNKbmNXdDJaR1Z1ZW05alJreDNRbEZOYlVSUlluQkpMMU5zYkUxTGNqUkNkejBpZlgwc0ltbHpjM1ZsY2lJNmV5SnBZU0k2SWpFdFptWXdNRG93T2pFeE1DSXNJbU5sY25ScFptbGpZWFJsWDNabGNuTnBiMjRpT2pGOUxDSmpaWEowYVdacFkyRjBaVjkwZVhCbElqb2lZWE1pZlE=","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpWTNKcGRDSTZXeUowZVhCbElpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUlzSW1saElsMHNJblI1Y0dVaU9pSmpaWEowYVdacFkyRjBaU0lzSW1ObGNuUnBabWxqWVhSbFgzWmxjbk5wYjI0aU9qRXNJbWxoSWpvaU1TMW1aakF3T2pBNk1URXdJbjA=","signature":"vP5dsgWOLA8H1ZpNXtCyyDfkiHrNUsBlXjpZ4e83buFo9VR4rW5dUwLFz9BNOeCSNI9FG9walOgqqGK99ci4Cw=="}]
+[{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJheUpSa2JLcVVUZmluSUxPRkdmVDlaRk5oUEpaVSt1Z1k3TzdJVHNsZFBFPSJ9fSwiaXNzdWVyIjp7InRyY192ZXJzaW9uIjoxfSwiY2VydGlmaWNhdGVfdHlwZSI6Imlzc3VlciJ9","protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InRyYyIsInRyY192ZXJzaW9uIjoxLCJjcml0IjpbInR5cGUiLCJ0cmNfdmVyc2lvbiJdfQ","signature":"duPkuPRbh_q1CVA-NSNTOHS_ROxUSnlRo3IX97uIGwKAeet4s3JVm3A4DhcAoNRWyrWZZGDTk0tfZ3QkJkdLAg"},{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MTAsImZvcm1hdF92ZXJzaW9uIjoxLCJkZXNjcmlwdGlvbiI6Iklzc3VlciBjZXJ0aWZpY2F0ZSAxLWZmMDA6MDoxMTAiLCJvcHRpb25hbF9kaXN0cmlidXRpb25fcG9pbnRzIjpbXSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3NjgyOTQ3MCwibm90X2FmdGVyIjoxNjA4MzY1NDcwfSwia2V5cyI6eyJlbmNyeXB0aW9uIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJjdXJ2ZTI1NTE5eHNhbHNhMjBwb2x5MTMwNSIsImtleSI6IjY5L1NSSVd2b1B2ZHJndDMzQzFhZ3E2dFpWb2pJOU5Xb1ZTblNGZUl4RTg9In0sInJldm9jYXRpb24iOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJTOHM3Y21kQVQxbnFLbkxCWndJM0ovNEJkZk15OExPekxobkhFZ2tWY0hrPSJ9LCJzaWduaW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiVFBEN2NDY1hIWHNvTTVRd013OU1FVGt4SXBLYlZBR2l3bzd6RlVubDNUQT0ifX0sImlzc3VlciI6eyJpYSI6IjEtZmYwMDowOjExMCIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjF9LCJjZXJ0aWZpY2F0ZV90eXBlIjoiYXMifQ","protected":"eyJhbGciOiJlZDI1NTE5IiwiY3JpdCI6WyJ0eXBlIiwiY2VydGlmaWNhdGVfdmVyc2lvbiIsImlhIl0sInR5cGUiOiJjZXJ0aWZpY2F0ZSIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjEsImlhIjoiMS1mZjAwOjA6MTEwIn0","signature":"B3Gm1t0Tf2VhMXueJbFE7L4FhcznC4uEq1avmcNOLfKd-e-fxSsVSUd_TiIzAlxeALSUBwTAvAdfinmKT3pXDg"}]
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_111-V1.crt b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_111-V1.crt
index c83fe020b..79ba78d92 100644
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_111-V1.crt
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-ASff00_0_111-V1.crt
@@ -1,1 +1,1 @@
-[{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lJekswbFNhR3AwVkVkTE5rbzJUbkJIYzNGNk0yOWFieXMwTWtsM04wWTNUM2RtSzJ4alV6VndUa2huUFNKOWZTd2lhWE56ZFdWeUlqcDdJblJ5WTE5MlpYSnphVzl1SWpveGZTd2lZMlZ5ZEdsbWFXTmhkR1ZmZEhsd1pTSTZJbWx6YzNWbGNpSjk=","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblJ5WXlJc0luUnlZMTkyWlhKemFXOXVJam94TENKamNtbDBJanBiSW5SNWNHVWlMQ0owY21OZmRtVnljMmx2YmlKZGZR","signature":"zmjtrge2J3PHtPOkf7sLQEkM5O+leN0gbi8rvJRYp9wIFUuh2Y4Ku5LLzGe/awrO9A51Kuza+vK+DDFH3Zv7BA=="},{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXhJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1TSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKclpYbHpJanA3SW1WdVkzSjVjSFJwYjI0aU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbU4xY25abE1qVTFNVGw0YzJGc2MyRXlNSEJ2YkhreE16QTFJaXdpYTJWNUlqb2lObVpxT1RONU5FOVdVR2xwZW5CaVEwYzFlRmhsYUVodVNrcElka0ZFTmtWb1p6SklhME12V0c1SFJUMGlmU3dpY21WMmIyTmhkR2x2YmlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklubEdaMmxuVkdwNk1HSTJVamhHYTNaV00wVlBkeTh2WXprMVZ6VkthblptUkdReE5WUmtOeTltWkVVOUluMHNJbk5wWjI1cGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpuVFhGMU9IZFlhVm81TVRSdFFsRjVaVWxJWnpZM1ZHODBhbkJyVUc1elNGRmhWemxEU2t4d2RWSlJQU0o5ZlN3aWFYTnpkV1Z5SWpwN0ltbGhJam9pTVMxbVpqQXdPakE2TVRFd0lpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUk2TVgwc0ltTmxjblJwWm1sallYUmxYM1I1Y0dVaU9pSmhjeUo5","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpWTNKcGRDSTZXeUowZVhCbElpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUlzSW1saElsMHNJblI1Y0dVaU9pSmpaWEowYVdacFkyRjBaU0lzSW1ObGNuUnBabWxqWVhSbFgzWmxjbk5wYjI0aU9qRXNJbWxoSWpvaU1TMW1aakF3T2pBNk1URXdJbjA=","signature":"1XDgwu17C7z6TMK3yIqyhVKYBgks0o0I1Kkn5hK29os86xLHAkVlW11VxtTwhdISpp2ieHy8Dp23TaQrLGONDA=="}]
+[{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJheUpSa2JLcVVUZmluSUxPRkdmVDlaRk5oUEpaVSt1Z1k3TzdJVHNsZFBFPSJ9fSwiaXNzdWVyIjp7InRyY192ZXJzaW9uIjoxfSwiY2VydGlmaWNhdGVfdHlwZSI6Imlzc3VlciJ9","protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InRyYyIsInRyY192ZXJzaW9uIjoxLCJjcml0IjpbInR5cGUiLCJ0cmNfdmVyc2lvbiJdfQ","signature":"duPkuPRbh_q1CVA-NSNTOHS_ROxUSnlRo3IX97uIGwKAeet4s3JVm3A4DhcAoNRWyrWZZGDTk0tfZ3QkJkdLAg"},{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTExIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMSIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJrZXlzIjp7ImVuY3J5cHRpb24iOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImN1cnZlMjU1MTl4c2Fsc2EyMHBvbHkxMzA1Iiwia2V5IjoiY2wvdWtkOUhhU1V1dzJJRFJYbjBCdDE3aXhwVzNJYnR5Nk1zS1RLMmNBVT0ifSwicmV2b2NhdGlvbiI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Im5ZY2c5Y3o2MXNKR0VUM3lpdklOVG1nNlJNZ1RwMHcwRnBUM1hYa0tJaDA9In0sInNpZ25pbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiIycjVZdVEyV2QvcFNlbUtWYWpqMUZjY2FwT3IxUEs4dG9GdGdGRlJyZTVnPSJ9fSwiaXNzdWVyIjp7ImlhIjoiMS1mZjAwOjA6MTEwIiwiY2VydGlmaWNhdGVfdmVyc2lvbiI6MX0sImNlcnRpZmljYXRlX3R5cGUiOiJhcyJ9","protected":"eyJhbGciOiJlZDI1NTE5IiwiY3JpdCI6WyJ0eXBlIiwiY2VydGlmaWNhdGVfdmVyc2lvbiIsImlhIl0sInR5cGUiOiJjZXJ0aWZpY2F0ZSIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjEsImlhIjoiMS1mZjAwOjA6MTEwIn0","signature":"kVh2N7VC9-eS6YXMzut-0l4Ux6xN-leddvkWnOQcIwL98MkR_sSESUn6r0tncl2BWDsymkiz9IwsmE-3nFf1Bw"}]
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V1.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V1.trc
index d27889dc3..424ecefde 100644
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V1.trc
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V1.trc
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjMU5UTTJOelEyTENKdWIzUmZZV1owWlhJaU9qRTJNRGN3TnpJM05EWjlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWFYTnpkV2x1WnlJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltbHpjM1ZwYm1jaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSktabkpUY0RGYVUwVnZaWHBuWW04d05YQkxVRzR3Um5WdlExQmFVMHhGUVhoNVkySjJiU3RNTkdwclBTSjlMQ0p2Wm1ac2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pVnpacVMyMW1PVEI1V1doT2JERlRia3hRZEZJek9XWkpVMEZQWTBGNFYzUnBNa1kyUVU1SVZVNDRORDBpZlN3aWIyNXNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaU9EVm9jMFZvVkRabWFsVnRSV1F5Y0RaclJGQTJhM0V3VjBsd1QwYzNZVU5hZEVZNE5IZDFjakZCWXowaWZYMTlMQ0ptWmpBd09qQTZNVEl3SWpwN0ltRjBkSEpwWW5WMFpYTWlPbHNpWVhWMGFHOXlhWFJoZEdsMlpTSXNJbU52Y21VaUxDSnBjM04xYVc1bklpd2lkbTkwYVc1bklsMHNJbXRsZVhNaU9uc2lhWE56ZFdsdVp5STZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZxUXpkbFpHc3ZZM1JRZVZKQlltbDZLM1ZtV0U5d1JrUTRiakZSUlhwUVNsRjZZV2hQVmpOVlJFazlJbjBzSW05bVpteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKdk1EVm9MMGhXTW5vek5GbDBSMWszVW5WSk4wZFlNMjFOV1ZOc1JEQktibEJrUm5KeWVrSnJWRkpCUFNKOUxDSnZibXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSk9kMkZ5WWpWMFIyZzRXVlp6Vm1NcmNrdE5WRkpsVWtSUVdEZExUVkpJWWtOWFZHZHRkVWd2UWtKSlBTSjlmWDBzSW1abU1EQTZNRG94TXpBaU9uc2lZWFIwY21saWRYUmxjeUk2V3lKaGRYUm9iM0pwZEdGMGFYWmxJaXdpWTI5eVpTSXNJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pTkZGWlRqaGFSakZ3WldGV1pYcG5PSEZEV1dWQ2RWVjVOR295VkRjdlYyeG9UMGhhVW1kd1l6SnNVVDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkltMW9kRlpCVFZwWWRUQktWa2xIZVd4a2FrbEhiVzFWU0VWNmRDODVZMWRWWlVOVloyVXhka1V5V21zOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJa1pLTTJaSWFVczBOV0ZWVlVOdVFscHJibkI1TldZMk9HOTNSbE5uV1V0RGJIaE1aMmc0TDNsQ1ZGRTlJbjE5Zlgwc0luWnZkR1Z6SWpwN2ZTd2ljSEp2YjJaZmIyWmZjRzl6YzJWemMybHZiaUk2ZXlKbVpqQXdPakE2TVRFd0lqcGJJbWx6YzNWcGJtY2lMQ0p2Ym14cGJtVWlMQ0p2Wm1ac2FXNWxJbDBzSW1abU1EQTZNRG94TWpBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV6TUNJNld5SnBjM04xYVc1bklpd2liMjVzYVc1bElpd2liMlptYkdsdVpTSmRmWDA=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"5iASl4Te3Mz7wj5P3KecRwT64tbKvciw0c2oVx2glJaU0fCfsGdzPSZu+Z+C3qwpRyqxYiwTwW86BAdIfdakBg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"bOQ3Icqopkf2z85i4ER0SmuAwJ+Ft0j78AUnZ04gtgYo8b9WXXyL8/NELCraPJUadxPtIReRp0rHBpyaDvAPCQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"ZNBfMUbp4AS5BtfDretYp4FXqNSO3AeRJ/hx4ATmN7JUJSADq4ELB8ZHkT9vGVNj2zAwPCZ4peGP5RtYBq/QBA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"LDabLwPra3ixKDOoSiXN82CbWWld1uPV0h0SFJ+h4GgRw2MyH8robfzSOLg7Vhjc5PPC6jy5K5c7ivV5jiI4Cw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNakFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"/H9BihWKl9B3opBSm+Fo8J3CvDNVmBvc2z9VwgJKUcsAUXl4Ie6KgzBmw0YJPhlyogp5Xlr1GQDBfwNskFp9Ag=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"V2Q7hCgzfA7N5cI6jjGrzuXPdgPo54XIoU592SuLQUNI6CjcDCUUb0a38LP7M461RJZOSQ1R93qSXzDsiOiGAg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"p6DBICCylnejN5WLupnJhdjBVx2mJs4oQewSJ3zjf40nDtEcbh1KNIutLmnSzH0C5r/+DtOqrKnSi+oT5D0NDQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNekFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"pp96jvCcBR0AXx673lP8QHEGSDBRdVrqoOECluBfD32ArQeHi0wGJNorOvoSQWycu4z35NphhLlzUy+KV7tsCQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"1sk37ECQFSQeNlAgs7sG13jIcduKxflDkf13TkNiXh65x4KYAwSPghr2A6VZIFjo4XPorK8ScBFK/e8eTnpDDQ=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTc2ODI5NDcwLCJub3RfYWZ0ZXIiOjE2MDgzNjU0NzB9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJGUVdSNGh3Y014UU5hWkhReUFlYmRaZDNjd0FqTXhVUDhsbTNtNmNxK0ZVPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoidVl1MFVPdUtXcWJYZmpUcXJtSnF1OU1CY0pYaGg0VWRKeFJDcHV4U0dHaz0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoieXZncWhTUlRPcWx4U3l1UmZ5TzRadStGTzYra0VycVNjZW5kUGlRc0Jncz0ifX19LCJmZjAwOjA6MTIwIjp7ImF0dHJpYnV0ZXMiOlsiYXV0aG9yaXRhdGl2ZSIsImNvcmUiLCJpc3N1aW5nIiwidm90aW5nIl0sImtleXMiOnsiaXNzdWluZyI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Im1PakdLZUdrNXAyL1V1THFCV2ZZR0wxS2VDbzJ6TmlrYWRZVXpjUFdQUEE9In0sIm9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJERnNBVnhwWFNJcGNvQ1FCNHd3dVhQMDQ5L1BDSmcxd0lSdERMczk4K2NnPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJaV3dEQU5zK1pYR25VMmpGdkhGZlhLZGRORm1KaWNpMHloSVlwL2tXaEdVPSJ9fX0sImZmMDA6MDoxMzAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoicU03VFBsc1JjTUhUQy9DZ3VrSzBqK3JDMUhYUk1kSE9NVktNUzlkRkpSND0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImIrTkZJL0psdjV4ZDJTcEVBN1B5WWlmM1Y2MzkzVGJKSnBmVStGTE10WVE9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InJoRzlLd2tJNHRKOTR6eXBRdVQxUG55d3lJN1orOCtEWVF5TktzMjRBTDg9In19fX0sInZvdGVzIjp7fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6eyJmZjAwOjA6MTEwIjpbImlzc3VpbmciLCJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMjAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEzMCI6WyJpc3N1aW5nIiwib25saW5lIiwib2ZmbGluZSJdfX0","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"kaU0Pjp4KtlLv3w09jjRO0BtGD2kYQiske-QlbUxa4atl8wGmJqOBmtiEctplQZbM4ob-vHi0_xdZ12xi4Y3Dg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"OfDZhwBvicaKnO58YuqCHF8o2RnkwI9QHuHU8ZxlipO_hhDJi1jyYMgfHSpkG6FVS86O0ZFXLnc9_nwMglcFBg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"GARoCzmKFbjsUd02wv9wKHFSMgCyEQ2rFehiO6MtIreAFWrVNOXyDY5xuOdCeQmDYfXd7FGROGQz1THzzyqxBw"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"ICFeAufbdriO0zzzxCdROLKh-HAAXDZD_Ly2JVYxv4OOd4Nnki8sMTwh9DNFAWuiXiO_rUfdcR1h9awuMgKsCA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"Otx54QdU256QCvpIzdR3-w2Rw3XOkT2Fm8AvvyOoXBUpaMSb1QOgJIkqxpLUEqfwUTgY8Em8QXx5aSwYDPeBDA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"LCTLsD2fTHM5puCpsigLiEBr5iynwV5TRGBVw5OnPxPNA87M-1lfRT5-OapK4Y064DIXEniyGfdeKqcjfnYOBA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"31bCGvpLO0Pi4NLrfe8fxDkrTUdjk0heH29s-18XVMLnA7sSrJLMPjkijDSw8D2DJS_lh0-w9o_0sAwerwPpBA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMzAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"mIOuJhci32IrMkniBzxHXGTSH2NsOsXwgRNvOzY7N164xXKbJymVsn48xYRvKytKUL6LI1JsbWCOIscZWD-jBg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"oLREEuKRv8SS7vZjmhiBIAT3J27uorhoDYz7iIt5DFUHjH8oyahyEJd_0q5UUToWNwiTkx4C2J4n2mJ3lo1jDg"}]}
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V2.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V2.trc
new file mode 100644
index 000000000..21c37e0c7
--- /dev/null
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V2.trc
@@ -0,0 +1,1 @@
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoyLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3NjgyOTQ3MCwibm90X2FmdGVyIjoxNjA4MzY1NDcwfSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiRlFXUjRod2NNeFFOYVpIUXlBZWJkWmQzY3dBak14VVA4bG0zbTZjcStGVT0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVZdTBVT3VLV3FiWGZqVHFybUpxdTlNQmNKWGhoNFVkSnhSQ3B1eFNHR2s9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Inl2Z3FoU1JUT3FseFN5dVJmeU80WnUrRk82K2tFcnFTY2VuZFBpUXNCZ3M9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJtT2pHS2VHazVwMi9VdUxxQldmWUdMMUtlQ28yek5pa2FkWVV6Y1BXUFBBPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiREZzQVZ4cFhTSXBjb0NRQjR3d3VYUDA0OS9QQ0pnMXdJUnRETHM5OCtjZz0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiWld3REFOcytaWEduVTJqRnZIRmZYS2RkTkZtSmljaTB5aElZcC9rV2hHVT0ifX19LCJmZjAwOjA6MTMwIjp7ImF0dHJpYnV0ZXMiOlsiYXV0aG9yaXRhdGl2ZSIsImNvcmUiLCJ2b3RpbmciXSwia2V5cyI6eyJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiYitORkkvSmx2NXhkMlNwRUE3UHlZaWYzVjYzOTNUYkpKcGZVK0ZMTXRZUT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoicmhHOUt3a0k0dEo5NHp5cFF1VDFQbnl3eUk3Wis4K0RZUXlOS3MyNEFMOD0ifX19fSwidm90ZXMiOnsiZmYwMDowOjExMCI6eyJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MX0sImZmMDA6MDoxMjAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9LCJmZjAwOjA6MTMwIjp7ImtleV90eXBlIjoib2ZmbGluZSIsImtleV92ZXJzaW9uIjoxfX0sInByb29mX29mX3Bvc3Nlc3Npb24iOnt9fQ","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"kpb-IhVfy7VU9HPmmjH3NlxGy9bKv-uuKbMwFwdIuRrSe3prc4TzEEdim5n0K3JH98WKPzmgR1oXtPUgGhsjDg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"rgUCet3fc8JoiQVJhQuMc_EWHWepjY0L0k8AgO0-daBLhTD6l_5zUgpqEFElc5Ptk-lFfXQzCxZu2S0Wud9HCg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"wYGhLXqyiQt4sCwSRyvcHa5wepVdoQTfcQl0CQ0XMcePZaEeSuS7nF8HxqoYhtLSXEghux4G_t_zoaNLRQBBDg"}]}
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V3.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V3.trc
new file mode 100644
index 000000000..2d17e25a7
--- /dev/null
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V3.trc
@@ -0,0 +1,1 @@
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjozLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3NjgyOTQ3MCwibm90X2FmdGVyIjoxNjA4MzY1NDcwfSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiRlFXUjRod2NNeFFOYVpIUXlBZWJkWmQzY3dBak14VVA4bG0zbTZjcStGVT0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVZdTBVT3VLV3FiWGZqVHFybUpxdTlNQmNKWGhoNFVkSnhSQ3B1eFNHR2s9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Inl2Z3FoU1JUT3FseFN5dVJmeU80WnUrRk82K2tFcnFTY2VuZFBpUXNCZ3M9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJtT2pHS2VHazVwMi9VdUxxQldmWUdMMUtlQ28yek5pa2FkWVV6Y1BXUFBBPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiREZzQVZ4cFhTSXBjb0NRQjR3d3VYUDA0OS9QQ0pnMXdJUnRETHM5OCtjZz0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiWld3REFOcytaWEduVTJqRnZIRmZYS2RkTkZtSmljaTB5aElZcC9rV2hHVT0ifX19LCJmZjAwOjA6MTMwIjp7ImF0dHJpYnV0ZXMiOlsiYXV0aG9yaXRhdGl2ZSIsImNvcmUiLCJ2b3RpbmciXSwia2V5cyI6eyJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiYitORkkvSmx2NXhkMlNwRUE3UHlZaWYzVjYzOTNUYkpKcGZVK0ZMTXRZUT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoicmhHOUt3a0k0dEo5NHp5cFF1VDFQbnl3eUk3Wis4K0RZUXlOS3MyNEFMOD0ifX19fSwidm90ZXMiOnsiZmYwMDowOjExMCI6eyJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxfSwiZmYwMDowOjEyMCI6eyJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxfSwiZmYwMDowOjEzMCI6eyJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxfX0sInByb29mX29mX3Bvc3Nlc3Npb24iOnt9fQ","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"Q3Wrb0hjHA24nP596PCwm0WScx6BhYtPf7JGidj09OfueYtxHKdOCKb0YhFtOCV1INbMsguVdjd8bZf1129BAQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"1AVlWUk62RVFrnBTKg5eViS7LqIxwEnkglVLiSaZT1d_FW7eEuQGyPVHbDmdwvJeCPrhC641eHmq51rUxxX8AA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMzAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"kp_OYqVVPdn695NoDZN9ASmAS-DvlQyIVTTWy4xeQL2XH08uLIFXmyPSY2k6juF0vp34Zozpn3cYFlZ8VId9CQ"}]}
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V7.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V7.trc
deleted file mode 100644
index 8627c5832..000000000
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD1-V7.trc
+++ /dev/null
@@ -1,1 +0,0 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqbzNMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakV4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpLWm5KVGNERmFVMFZ2WlhwblltOHdOWEJMVUc0d1JuVnZRMUJhVTB4RlFYaDVZMkoyYlN0TU5HcHJQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaVZ6WnFTMjFtT1RCNVdXaE9iREZUYmt4UWRGSXpPV1pKVTBGUFkwRjRWM1JwTWtZMlFVNUlWVTQ0TkQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lPRFZvYzBWb1ZEWm1hbFZ0UldReWNEWnJSRkEyYTNFd1YwbHdUMGMzWVVOYWRFWTROSGQxY2pGQll6MGlmWDE5TENKbVpqQXdPakE2TVRJd0lqcDdJbUYwZEhKcFluVjBaWE1pT2xzaVlYVjBhRzl5YVhSaGRHbDJaU0lzSW1OdmNtVWlMQ0pwYzNOMWFXNW5JaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYVhOemRXbHVaeUk2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW5WcVF6ZGxaR3N2WTNSUWVWSkJZbWw2SzNWbVdFOXdSa1E0YmpGUlJYcFFTbEY2WVdoUFZqTlZSRWs5SW4wc0ltOW1abXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSnZNRFZvTDBoV01ub3pORmwwUjFrM1VuVkpOMGRZTTIxTldWTnNSREJLYmxCa1JuSnlla0pyVkZKQlBTSjlMQ0p2Ym14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpPZDJGeVlqVjBSMmc0V1ZaelZtTXJja3ROVkZKbFVrUlFXRGRMVFZKSVlrTlhWR2R0ZFVndlFrSkpQU0o5Zlgwc0ltWm1NREE2TURveE16QWlPbnNpWVhSMGNtbGlkWFJsY3lJNld5SmhkWFJvYjNKcGRHRjBhWFpsSWl3aVkyOXlaU0lzSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaU5GRlpUamhhUmpGd1pXRldaWHBuT0hGRFdXVkNkVlY1TkdveVZEY3ZWMnhvVDBoYVVtZHdZekpzVVQwaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbTFvZEZaQlRWcFlkVEJLVmtsSGVXeGtha2xIYlcxVlNFVjZkQzg1WTFkVlpVTlZaMlV4ZGtVeVdtczlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWtaS00yWklhVXMwTldGVlZVTnVRbHByYm5CNU5XWTJPRzkzUmxObldVdERiSGhNWjJnNEwzbENWRkU5SW4xOWZYMHNJblp2ZEdWeklqcDdJbVptTURBNk1Eb3hNVEFpT25zaWEyVjVYM1I1Y0dVaU9pSnZibXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVgwc0ltWm1NREE2TURveE1qQWlPbnNpYTJWNVgzUjVjR1VpT2lKdmJteHBibVVpTENKclpYbGZkbVZ5YzJsdmJpSTZNWDBzSW1abU1EQTZNRG94TXpBaU9uc2lhMlY1WDNSNWNHVWlPaUp2Ym14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1YMTlMQ0p3Y205dlpsOXZabDl3YjNOelpYTnphVzl1SWpwN2ZYMA==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTl1YkdsdVpTSXNJbXRsZVY5MlpYSnphVzl1SWpveExDSmhjeUk2SW1abU1EQTZNRG94TVRBaUxDSmpjbWwwSWpwYkluUjVjR1VpTENKclpYbGZkSGx3WlNJc0ltdGxlVjkyWlhKemFXOXVJaXdpWVhNaVhYMA==","signature":"wTpW/SP68f+/V/gb/f5O7OLB1A/Ckk8YuwTWhimJtbVM3IVM+7yvNV5D+TwK6WQpqK6HYl1Zcaz5kviRH5JQBA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTl1YkdsdVpTSXNJbXRsZVY5MlpYSnphVzl1SWpveExDSmhjeUk2SW1abU1EQTZNRG94TWpBaUxDSmpjbWwwSWpwYkluUjVjR1VpTENKclpYbGZkSGx3WlNJc0ltdGxlVjkyWlhKemFXOXVJaXdpWVhNaVhYMA==","signature":"RwMy2bWOFd0xVzREHjwO1TNSaX7PeWg3Vsduu9b0cjJrfplJah7QRLV3qejfHdQknJ84lLdWEflVuFEGhvw7CQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTl1YkdsdVpTSXNJbXRsZVY5MlpYSnphVzl1SWpveExDSmhjeUk2SW1abU1EQTZNRG94TXpBaUxDSmpjbWwwSWpwYkluUjVjR1VpTENKclpYbGZkSGx3WlNJc0ltdGxlVjkyWlhKemFXOXVJaXdpWVhNaVhYMA==","signature":"qpcdsnOX9XNtGg4fdZwBVsL8acyyOH58aNWdwIzWYux/wgl525Ewf0YDyQOCZMo2q73mDxmKJnd7PWp481n7Dw=="}]}
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V1.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V1.trc
deleted file mode 100644
index f0f7d95e0..000000000
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V1.trc
+++ /dev/null
@@ -1,1 +0,0 @@
-{"payload":"ZXlKcGMyUWlPaklzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJRElpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjMU5UTTJOelEyTENKdWIzUmZZV1owWlhJaU9qRTJNRGN3TnpJM05EWjlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qSXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWFYTnpkV2x1WnlJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltbHpjM1ZwYm1jaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSjJXa3RaWlhWTlVGaEVLMHRWTmlzMEt5OHdlbVpSUVZOcGNFWklVVzB5UVVsSGRsUnpkMVJsYWs1blBTSjlMQ0p2Wm1ac2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pV2xSMGJUUjFkbFoyYW14b1dEQm5RbEppZFZkWGJFOXlZM0JZWVc5SWQxbFVPWEJGVTJSUGRVUjFNRDBpZlN3aWIyNXNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaVFWTTRTelUyU0d4aU5HSXZNbmxDWjNGUlZpdENTMmhLTVM5VFQwcG9XVTlRVDNaclJqSTVNMGxPTUQwaWZYMTlMQ0ptWmpBd09qQTZNakl3SWpwN0ltRjBkSEpwWW5WMFpYTWlPbHNpWVhWMGFHOXlhWFJoZEdsMlpTSXNJbU52Y21VaUxDSnBjM04xYVc1bklpd2lkbTkwYVc1bklsMHNJbXRsZVhNaU9uc2lhWE56ZFdsdVp5STZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJak4yTXl0V1FWaDJObU5pU0c5V2JsUklOMmN4UVhkUlV6QlRXVFZqTTAxek1taEVOM1kwU1c1dGIyczlJbjBzSW05bVpteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKWkwwOXBVbk1yTUVsMVVWQXZSMncyWmxwVlJFbHVZMlZOTW05YU1rZHhkbWxsZW0xbFJuQjBRVU5qUFNKOUxDSnZibXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSktUMEZaU1dkVWJrZHdUV1EyTW14R1JqSkZNVXN3UW04NVJHWXpSV2M1U0VFMWRqRmFRMjAyU201TlBTSjlmWDE5TENKMmIzUmxjeUk2ZTMwc0luQnliMjltWDI5bVgzQnZjM05sYzNOcGIyNGlPbnNpWm1Zd01Eb3dPakl4TUNJNld5SnBjM04xYVc1bklpd2liMjVzYVc1bElpd2liMlptYkdsdVpTSmRMQ0ptWmpBd09qQTZNakl3SWpwYkltbHpjM1ZwYm1jaUxDSnZibXhwYm1VaUxDSnZabVpzYVc1bElsMTlmUQ==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNakV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"Zd42tW63mqcLBcB52jy1Vbm18vo0ESPK0SFGuG35KLrECtJuZwJsyJj3PW/0gfutoBPw0J3swdlrDYcHBB9/Cw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3lNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"oJDWnrW/gUGBKzg2frlGw6Slb4k+N4q7CF7L3L3mGuM/LHfpMmPCR8z2HbL27YRT/QC7foM7OpQQR7UUXDivBg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNakV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"ho8Mm1f06y3cvvzkiZ2G3lPIJ0DbibA0rbK5OMMjSgE0A8OcUiA7/HXdS3VWh7rXuXUy51dSxQCsJ6NsY7HjDA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNakl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"3Jn9F1Y0hiTjn/NI5B17bsYSgtkCJDLIOikMHq9OvCg3oUHWgIQCeMrg0fkndBaQxJrTQQqJmdRMSJauuBaGBw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3lNakFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"XXbTa3nGOPakjx+sAkmma8lwrfGfgUlKXNarP7Yo7vU6E/+ReQPHfyQYZVacvMvQwPo9i2e3rngQOQ3azVLFCA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNakl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"1CGRAcGEkNTvEhcIH3CtQLaoTXfMQZQvxAesLabjKAnry/NOxZX0o6BdWNaGZzAYtuE0s+OpmS6IrtUi1C3GDA=="}]}
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V2.trc b/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V2.trc
deleted file mode 100644
index eec0f9df8..000000000
--- a/go/lib/infra/modules/trust/v2/trustdbtest/testdata/ISD2-V2.trc
+++ /dev/null
@@ -1,1 +0,0 @@
-{"payload":"ZXlKcGMyUWlPaklzSW5SeVkxOTJaWEp6YVc5dUlqb3lMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJRElpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UYzFOVE0yTnpRMkxDSnViM1JmWVdaMFpYSWlPakUyTURjd056STNORFo5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakl4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lkbTkwYVc1bklsMHNJbXRsZVhNaU9uc2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbHBVZEcwMGRYWldkbXBzYUZnd1owSlNZblZYVjJ4UGNtTndXR0Z2U0hkWlZEbHdSVk5rVDNWRWRUQTlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWtGVE9FczFOa2hzWWpSaUx6SjVRbWR4VVZZclFrdG9TakV2VTA5S2FGbFBVRTkyYTBZeU9UTkpUakE5SW4xOWZTd2labVl3TURvd09qSXlNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWFYTnpkV2x1WnlJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltbHpjM1ZwYm1jaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSXpkak1yVmtGWWRqWmpZa2h2Vm01VVNEZG5NVUYzVVZNd1UxazFZek5OY3pKb1JEZDJORWx1Ylc5clBTSjlMQ0p2Wm1ac2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pV1M5UGFWSnpLekJKZFZGUUwwZHNObVphVlVSSmJtTmxUVEp2V2pKSGNYWnBaWHB0WlVad2RFRkRZejBpZlN3aWIyNXNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaVNrOUJXVWxuVkc1SGNFMWtOakpzUmtZeVJURkxNRUp2T1VSbU0wVm5PVWhCTlhZeFdrTnROa3B1VFQwaWZYMTlmU3dpZG05MFpYTWlPbnNpWm1Zd01Eb3dPakl4TUNJNmV5SnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1YMHNJbVptTURBNk1Eb3lNakFpT25zaWEyVjVYM1I1Y0dVaU9pSnZabVpzYVc1bElpd2lhMlY1WDNabGNuTnBiMjRpT2pGOWZTd2ljSEp2YjJaZmIyWmZjRzl6YzJWemMybHZiaUk2ZTMxOQ==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TWpFd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"XjoYn5e+oprB9ZyA0PLwChFDF0c960WybEiPPt/I9xXaBghhXY3lL+fOSCp7NbvdunQmxoDfqBQ6gh86m5coBQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TWpJd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"ZcvuXfm/IUrkD4oRLC7jDqfhaDm2aHFXCqOzmfMnztLdKS97JnstUKZTPH0XXtR56qwzsMutdRK/EzftXUUuCA=="}]}
\ No newline at end of file
diff --git a/go/lib/infra/modules/trust/v2/trustdbtest/trustdbtest.go b/go/lib/infra/modules/trust/v2/trustdbtest/trustdbtest.go
index b414e78d9..6a6e2c9d5 100644
--- a/go/lib/infra/modules/trust/v2/trustdbtest/trustdbtest.go
+++ b/go/lib/infra/modules/trust/v2/trustdbtest/trustdbtest.go
@@ -117,7 +117,7 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		return dec
 	}
 	v1 := insert("ISD1-V1.trc")
-	v7 := insert("ISD1-V7.trc")
+	v2 := insert("ISD1-V2.trc")
 
 	t.Run("TRCExists", func(t *testing.T) {
 		// Check existing TRC.
@@ -125,14 +125,14 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		assert.NoError(t, err)
 		assert.True(t, exists)
 		// Check inexistent TRC.
-		other, err := decoded.DecodeTRC(loadFile(t, cfg.filePath("ISD2-V1.trc")))
+		other, err := decoded.DecodeTRC(loadFile(t, cfg.filePath("ISD1-V3.trc")))
 		require.NoError(t, err)
 		exists, err = db.TRCExists(ctx, other)
 		assert.NoError(t, err)
 		assert.False(t, exists)
 		// Check existing TRC with different content.
 		mismatch := v1
-		mismatch.Signed.EncodedTRC = []byte("some garbage")
+		mismatch.Signed.EncodedTRC = "some garbage"
 		exists, err = db.TRCExists(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.True(t, exists)
@@ -145,7 +145,7 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		// Fetch max of existing TRC.
 		max, err := db.GetTRC(ctx, trust.TRCID{ISD: v1.TRC.ISD, Version: scrypto.LatestVer})
 		assert.NoError(t, err)
-		assert.Equal(t, v7.TRC, max)
+		assert.Equal(t, v2.TRC, max)
 		// Fetch inexistent TRC.
 		_, err = db.GetTRC(ctx, trust.TRCID{ISD: 42, Version: scrypto.LatestVer})
 		xtest.AssertErrorsIs(t, err, trust.ErrNotFound)
@@ -158,7 +158,7 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		// Fetch max of existing TRC.
 		max, err := db.GetRawTRC(ctx, trust.TRCID{ISD: v1.TRC.ISD, Version: scrypto.LatestVer})
 		assert.NoError(t, err)
-		assert.Equal(t, v7.Raw, max)
+		assert.Equal(t, v2.Raw, max)
 		// Fetch inexistent TRC.
 		_, err = db.GetRawTRC(ctx, trust.TRCID{ISD: 42, Version: scrypto.LatestVer})
 		xtest.AssertErrorsIs(t, err, trust.ErrNotFound)
@@ -175,9 +175,9 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		assert.Equal(t, info, fetched)
 		// Fetch max of existing TRC.
 		info = trust.TRCInfo{
-			Validity:    *v7.TRC.Validity,
-			GracePeriod: v7.TRC.GracePeriod.Duration,
-			Version:     v7.TRC.Version,
+			Validity:    *v2.TRC.Validity,
+			GracePeriod: v2.TRC.GracePeriod.Duration,
+			Version:     v2.TRC.Version,
 		}
 		max, err := db.GetTRCInfo(ctx, trust.TRCID{ISD: v1.TRC.ISD, Version: scrypto.LatestVer})
 		assert.NoError(t, err)
@@ -200,19 +200,18 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 			ia120: {TRC: trcInfo1, Version: 1},
 			ia130: {TRC: trcInfo1, Version: 1},
 		}
-		trcInfo7 := trust.TRCInfo{
-			Validity:    *v7.TRC.Validity,
-			GracePeriod: v7.TRC.GracePeriod.Duration,
-			Version:     v7.TRC.Version,
+		trcInfo2 := trust.TRCInfo{
+			Validity:    *v2.TRC.Validity,
+			GracePeriod: v2.TRC.GracePeriod.Duration,
+			Version:     v2.TRC.Version,
 		}
-		expectedKeyInfos7 := map[addr.IA]trust.KeyInfo{
-			ia110: {TRC: trcInfo7, Version: 1},
-			ia120: {TRC: trcInfo7, Version: 1},
-			ia130: {TRC: trcInfo7, Version: 1},
+		expectedKeyInfos2 := map[addr.IA]trust.KeyInfo{
+			ia110: {TRC: trcInfo2, Version: 1},
+			ia120: {TRC: trcInfo2, Version: 1},
 		}
 		okTests := map[scrypto.Version]map[addr.IA]trust.KeyInfo{
 			1: expectedKeyInfos1,
-			7: expectedKeyInfos7,
+			2: expectedKeyInfos2,
 		}
 		for ver, expectedKeyInfos := range okTests {
 			for ia, expected := range expectedKeyInfos {
@@ -235,9 +234,7 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 			assert.Equal(t, trust.KeyInfo{}, actual)
 		})
 		t.Run("fetch non-issuing ia", func(t *testing.T) {
-			insert("ISD2-V2.trc")
-			ia210 := xtest.MustParseIA("2-ff00:0:210")
-			actual, err := db.GetIssuingKeyInfo(context.Background(), ia210, 2)
+			actual, err := db.GetIssuingKeyInfo(context.Background(), ia130, 2)
 			xtest.AssertErrorsIs(t, err, trust.ErrNotFound)
 			assert.Equal(t, trust.KeyInfo{}, actual)
 		})
@@ -249,7 +246,7 @@ func testTRC(t *testing.T, db trust.ReadWrite, cfg Config) {
 		assert.False(t, inserted)
 		// Insert existing TRC with different contents.
 		mismatch := v1
-		mismatch.Signed.EncodedTRC = []byte("some garbage")
+		mismatch.Signed.EncodedTRC = "some garbage"
 		inserted, err = db.InsertTRC(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.False(t, inserted)
@@ -269,7 +266,7 @@ func testChain(t *testing.T, db trust.ReadWrite, cfg Config) {
 		return dec
 	}
 	v1 := insert("ISD1-ASff00_0_110-V1.crt", true)
-	v7 := insert("ISD1-ASff00_0_110-V10.crt", false)
+	v2 := insert("ISD1-ASff00_0_110-V10.crt", false)
 
 	t.Run("ChainExists", func(t *testing.T) {
 		// Check existing certificate chain.
@@ -284,13 +281,13 @@ func testChain(t *testing.T, db trust.ReadWrite, cfg Config) {
 		assert.False(t, exists)
 		// Check existing certificate chain with different content in AS certificate.
 		mismatch := v1
-		mismatch.Chain.AS.Encoded = []byte("some garbage")
+		mismatch.Chain.AS.Encoded = "some garbage"
 		exists, err = db.ChainExists(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.False(t, exists)
 		// Check existing certificate chain with different content in issuer certificate.
 		mismatch = v1
-		mismatch.Chain.Issuer.Encoded = []byte("some garbage")
+		mismatch.Chain.Issuer.Encoded = "some garbage"
 		exists, err = db.ChainExists(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.False(t, exists)
@@ -305,7 +302,7 @@ func testChain(t *testing.T, db trust.ReadWrite, cfg Config) {
 		max, err := db.GetRawChain(ctx, trust.ChainID{
 			IA: v1.AS.Subject, Version: scrypto.LatestVer})
 		assert.NoError(t, err)
-		assert.Equal(t, v7.Raw, max)
+		assert.Equal(t, v2.Raw, max)
 		// Check inexistent certificate chain.
 		_, err = db.GetRawChain(ctx, trust.ChainID{
 			IA:      xtest.MustParseIA("42-ff00:0:142"),
@@ -328,14 +325,14 @@ func testChain(t *testing.T, db trust.ReadWrite, cfg Config) {
 		assert.False(t, issInserted)
 		// Check existing certificate chain with different content in AS certificate.
 		mismatch := v1
-		mismatch.Chain.AS.Encoded = []byte("some garbage")
+		mismatch.Chain.AS.Encoded = "some garbage"
 		asInserted, issInserted, err = db.InsertChain(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.False(t, asInserted)
 		assert.False(t, issInserted)
 		// Check existing certificate chain with different content in AS certificate.
 		mismatch = v1
-		mismatch.Chain.Issuer.Encoded = []byte("some garbage")
+		mismatch.Chain.Issuer.Encoded = "some garbage"
 		asInserted, issInserted, err = db.InsertChain(ctx, mismatch)
 		xtest.AssertErrorsIs(t, err, trust.ErrContentMismatch)
 		assert.False(t, asInserted)
diff --git a/go/lib/scrypto/cert/v2/as_signed_test.go b/go/lib/scrypto/cert/v2/as_signed_test.go
index 144bf2b55..4d2002f6e 100644
--- a/go/lib/scrypto/cert/v2/as_signed_test.go
+++ b/go/lib/scrypto/cert/v2/as_signed_test.go
@@ -71,11 +71,11 @@ func TestEncodedASDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Garbage cert": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     cert.EncodedAS(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
@@ -132,15 +132,15 @@ func TestEncodedProtectedASDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Invalid utf-8": {
-			Input:     []byte(scrypto.Base64.EncodeToString([]byte{0xfe})),
+			Input:     cert.EncodedProtectedAS(scrypto.Base64.EncodeToString([]byte{0xfe})),
 			Assertion: assert.Error,
 		},
 		"Garbage JSON": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     cert.EncodedProtectedAS(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
@@ -152,6 +152,10 @@ func TestEncodedProtectedASDecode(t *testing.T) {
 	}
 }
 
+func encode(input string) string {
+	return scrypto.Base64.EncodeToString([]byte(input))
+}
+
 func newBaseProtectedAS() cert.ProtectedAS {
 	return cert.ProtectedAS{
 		Algorithm:          scrypto.Ed25519,
diff --git a/go/lib/scrypto/cert/v2/issuer_signed_test.go b/go/lib/scrypto/cert/v2/issuer_signed_test.go
index b9ec8cb11..681c34d68 100644
--- a/go/lib/scrypto/cert/v2/issuer_signed_test.go
+++ b/go/lib/scrypto/cert/v2/issuer_signed_test.go
@@ -71,11 +71,11 @@ func TestEncodedIssuerDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Garbage cert": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     cert.EncodedIssuer(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
@@ -132,15 +132,15 @@ func TestEncodedProtectedIssuerDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Invalid utf-8": {
-			Input:     []byte(scrypto.Base64.EncodeToString([]byte{0xfe})),
+			Input:     cert.EncodedProtectedIssuer(scrypto.Base64.EncodeToString([]byte{0xfe})),
 			Assertion: assert.Error,
 		},
 		"Garbage JSON": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     cert.EncodedProtectedIssuer(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
diff --git a/go/lib/scrypto/cert/v2/verify_test.go b/go/lib/scrypto/cert/v2/verify_test.go
index c4f4dd3cf..bb2ce5cc6 100644
--- a/go/lib/scrypto/cert/v2/verify_test.go
+++ b/go/lib/scrypto/cert/v2/verify_test.go
@@ -41,7 +41,7 @@ func TestASVerifierVerify(t *testing.T) {
 		"unparsable protected": {
 			Modify: func(*cert.AS, *cert.Issuer, *cert.ProtectedAS) {},
 			ModifySigned: func(signed *cert.SignedAS) {
-				signed.EncodedProtected[0] ^= 0xFF
+				signed.EncodedProtected = "!"
 			},
 			ExpectedErrMsg: "illegal base64 data at input byte 0",
 		},
@@ -154,7 +154,7 @@ func TestIssuerVerifierVerify(t *testing.T) {
 		"unparsable protected": {
 			Modify: func(*cert.Issuer, *trc.TRC, *cert.ProtectedIssuer) {},
 			ModifySigned: func(signed *cert.SignedIssuer) {
-				signed.EncodedProtected[0] ^= 0xFF
+				signed.EncodedProtected = "!"
 			},
 			ExpectedErrMsg: "illegal base64 data at input byte 0",
 		},
diff --git a/go/lib/scrypto/defs_test.go b/go/lib/scrypto/defs_test.go
new file mode 100644
index 000000000..8d0339c4b
--- /dev/null
+++ b/go/lib/scrypto/defs_test.go
@@ -0,0 +1,42 @@
+// Copyright 2019 Anapaya Systems
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package scrypto_test
+
+import (
+	"crypto/rand"
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/scionproto/scion/go/lib/scrypto"
+)
+
+func TestJWSignatureMarshalUnmarshal(t *testing.T) {
+	type container struct {
+		Signature scrypto.JWSignature
+	}
+
+	orig := container{Signature: make(scrypto.JWSignature, 32)}
+	_, err := rand.Read(orig.Signature)
+	require.NoError(t, err)
+	enc, err := json.Marshal(orig)
+	require.NoError(t, err)
+	var dec container
+	err = json.Unmarshal(enc, &dec)
+	require.NoError(t, err)
+	assert.Equal(t, orig, dec)
+}
diff --git a/go/lib/scrypto/trc/v2/signed_test.go b/go/lib/scrypto/trc/v2/signed_test.go
index b5a4817c6..f58626230 100644
--- a/go/lib/scrypto/trc/v2/signed_test.go
+++ b/go/lib/scrypto/trc/v2/signed_test.go
@@ -72,11 +72,11 @@ func TestEncodedDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Garbage TRC": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     trc.Encoded(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
@@ -133,15 +133,15 @@ func TestEncodedProtectedDecode(t *testing.T) {
 			Assertion: assert.NoError,
 		},
 		"Invalid Base 64": {
-			Input:     []byte("invalid/base64"),
+			Input:     "invalid/base64",
 			Assertion: assert.Error,
 		},
 		"Invalid utf-8": {
-			Input:     []byte(scrypto.Base64.EncodeToString([]byte{0xfe})),
+			Input:     trc.EncodedProtected(scrypto.Base64.EncodeToString([]byte{0xfe})),
 			Assertion: assert.Error,
 		},
 		"Garbage JSON": {
-			Input:     []byte(scrypto.Base64.EncodeToString(valid[:len(valid)/2])),
+			Input:     trc.EncodedProtected(encode("some_garbage")),
 			Assertion: assert.Error,
 		},
 	}
@@ -153,6 +153,10 @@ func TestEncodedProtectedDecode(t *testing.T) {
 	}
 }
 
+func encode(input string) string {
+	return scrypto.Base64.EncodeToString([]byte(input))
+}
+
 func newBaseProtected() trc.Protected {
 	return trc.Protected{
 		Algorithm:  scrypto.Ed25519,
diff --git a/go/lib/scrypto/trc/v2/verify_test.go b/go/lib/scrypto/trc/v2/verify_test.go
index 2bcd61732..178a38cb3 100644
--- a/go/lib/scrypto/trc/v2/verify_test.go
+++ b/go/lib/scrypto/trc/v2/verify_test.go
@@ -40,7 +40,7 @@ var (
 		},
 		"Undecodable": {
 			Modify: func(_ *testing.T, sigs *[]trc.Signature) {
-				(*sigs)[0].EncodedProtected[1] = '!'
+				(*sigs)[0].EncodedProtected = "!"
 			},
 			ExpectedErrMsg: "illegal base64 data",
 		},
diff --git a/go/lib/xtest/helpers.go b/go/lib/xtest/helpers.go
index d20f7b274..6fc1efe85 100644
--- a/go/lib/xtest/helpers.go
+++ b/go/lib/xtest/helpers.go
@@ -30,7 +30,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/scionproto/scion/go/lib/addr"
-	"github.com/scionproto/scion/go/lib/common"
 )
 
 // TempFileName creates a temporary file in dir with the specified prefix, and
@@ -158,7 +157,7 @@ func MustParseAS(s string) addr.AS {
 
 // MustParseHexString parses s and returns the corresponding byte slice.
 // It panics if the decoding fails.
-func MustParseHexString(s string) common.RawBytes {
+func MustParseHexString(s string) []byte {
 	// remove whitespace
 	reg, err := regexp.Compile(`\s+`)
 	if err != nil {
diff --git a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_110/certs/ISD1-ASff00_0_110-V1.issuer b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_110/certs/ISD1-ASff00_0_110-V1.issuer
index 7461755fa..52fd09833 100644
--- a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_110/certs/ISD1-ASff00_0_110-V1.issuer
+++ b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_110/certs/ISD1-ASff00_0_110-V1.issuer
@@ -1,1 +1,1 @@
-{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16TnpZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazNOamw5TENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKVVVXaDVORzVGTkdSalFtNXpUa0prVVVOaVNFNHdOR1Z2ZUZCU1JIWjRkamt4TUVVdlNGRnllaTlqUFNKOUxDSnlaWFp2WTJGMGFXOXVJanA3SW10bGVWOTJaWEp6YVc5dUlqb3lMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pVXpKR2IxcGxLM1JHVXpBM1FsVnNaWEpRWWtKaGJqVlJRVlo2VGswMlJGUTNTVGxNV210clJHRlFPRDBpZlgwc0ltbHpjM1ZsY2lJNmV5SjBjbU5mZG1WeWMybHZiaUk2TVgwc0ltTmxjblJwWm1sallYUmxYM1I1Y0dVaU9pSnBjM04xWlhJaWZR","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblJ5WXlJc0luUnlZMTkyWlhKemFXOXVJam94TENKamNtbDBJanBiSW5SNWNHVWlMQ0owY21OZmRtVnljMmx2YmlKZGZR","signature":"k0GLHNQJjByF8fFb+Mscv6bvwLObJSDq5RX3f9u1UFu7m/UMdpbuWRRksQNKWo7WBo7Xtj29WaqXmQBhLQm2AA=="}
+{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJUUWh5NG5FNGRjQm5zTkJkUUNiSE4wNGVveFBSRHZ4djkxMEUvSFFyei9jPSJ9LCJyZXZvY2F0aW9uIjp7ImtleV92ZXJzaW9uIjoyLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiUzJGb1plK3RGUzA3QlVsZXJQYkJhbjVRQVZ6Tk02RFQ3STlMWmtrRGFQOD0ifX0sImlzc3VlciI6eyJ0cmNfdmVyc2lvbiI6MX0sImNlcnRpZmljYXRlX3R5cGUiOiJpc3N1ZXIifQ","protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InRyYyIsInRyY192ZXJzaW9uIjoxLCJjcml0IjpbInR5cGUiLCJ0cmNfdmVyc2lvbiJdfQ","signature":"k0GLHNQJjByF8fFb-Mscv6bvwLObJSDq5RX3f9u1UFu7m_UMdpbuWRRksQNKWo7WBo7Xtj29WaqXmQBhLQm2AA"}
diff --git a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_111/certs/ISD1-ASff00_0_111-V1.crt b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_111/certs/ISD1-ASff00_0_111-V1.crt
index a54a73a71..98b367b77 100644
--- a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_111/certs/ISD1-ASff00_0_111-V1.crt
+++ b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/ASff00_0_111/certs/ISD1-ASff00_0_111-V1.crt
@@ -1,1 +1,1 @@
-[{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXdJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pU1hOemRXVnlJR05sY25ScFptbGpZWFJsSURFdFptWXdNRG93T2pFeE1DSXNJbTl3ZEdsdmJtRnNYMlJwYzNSeWFXSjFkR2x2Ymw5d2IybHVkSE1pT2x0ZExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16TnpZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazNOamw5TENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKVVVXaDVORzVGTkdSalFtNXpUa0prVVVOaVNFNHdOR1Z2ZUZCU1JIWjRkamt4TUVVdlNGRnllaTlqUFNKOUxDSnlaWFp2WTJGMGFXOXVJanA3SW10bGVWOTJaWEp6YVc5dUlqb3lMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pVXpKR2IxcGxLM1JHVXpBM1FsVnNaWEpRWWtKaGJqVlJRVlo2VGswMlJGUTNTVGxNV210clJHRlFPRDBpZlgwc0ltbHpjM1ZsY2lJNmV5SjBjbU5mZG1WeWMybHZiaUk2TVgwc0ltTmxjblJwWm1sallYUmxYM1I1Y0dVaU9pSnBjM04xWlhJaWZR","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblJ5WXlJc0luUnlZMTkyWlhKemFXOXVJam94TENKamNtbDBJanBiSW5SNWNHVWlMQ0owY21OZmRtVnljMmx2YmlKZGZR","signature":"k0GLHNQJjByF8fFb+Mscv6bvwLObJSDq5RX3f9u1UFu7m/UMdpbuWRRksQNKWo7WBo7Xtj29WaqXmQBhLQm2AA=="},{"payload":"ZXlKemRXSnFaV04wSWpvaU1TMW1aakF3T2pBNk1URXhJaXdpZG1WeWMybHZiaUk2TVN3aVptOXliV0YwWDNabGNuTnBiMjRpT2pFc0ltUmxjMk55YVhCMGFXOXVJam9pUVZNZ1kyVnlkR2xtYVdOaGRHVWdNUzFtWmpBd09qQTZNVEV4SWl3aWIzQjBhVzl1WVd4ZlpHbHpkSEpwWW5WMGFXOXVYM0J2YVc1MGN5STZXMTBzSW5aaGJHbGthWFI1SWpwN0ltNXZkRjlpWldadmNtVWlPakUxTnpNd016TTNOamtzSW01dmRGOWhablJsY2lJNk1UWXdORFUyT1RjMk9YMHNJbXRsZVhNaU9uc2laVzVqY25sd2RHbHZiaUk2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNaXdpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW5SUk5IZFFhVEF4YzBGdU5tSlZTVlJKY1VGWVMyRnpjakE1U0RsdFZsaHNkRWRFTUhKWE1FSlFNVms5SW4wc0luSmxkbTlqWVhScGIyNGlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qSXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpZUkdWTmVUWTROMk5HYlRaUVZuRjVPV2hYTVZwUWVGRkZNa0ZEZUVock5rYzVjbXRHTW1aeVV6UTRQU0o5TENKemFXZHVhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWVFaGFkUzloV1VSWVRIUjBWM0JYVldsVVZWaHJiRFZKVVZOSGVGcDBkblpDWVU1bmFHcFBOWFJLVVQwaWZYMHNJbWx6YzNWbGNpSTZleUpwWVNJNklqRXRabVl3TURvd09qRXhNQ0lzSW1ObGNuUnBabWxqWVhSbFgzWmxjbk5wYjI0aU9qRjlMQ0pqWlhKMGFXWnBZMkYwWlY5MGVYQmxJam9pWVhNaWZR","protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpWTNKcGRDSTZXeUowZVhCbElpd2lZMlZ5ZEdsbWFXTmhkR1ZmZG1WeWMybHZiaUlzSW1saElsMHNJblI1Y0dVaU9pSmpaWEowYVdacFkyRjBaU0lzSW1ObGNuUnBabWxqWVhSbFgzWmxjbk5wYjI0aU9qRXNJbWxoSWpvaU1TMW1aakF3T2pBNk1URXdJbjA=","signature":"bMPZwb0sLByit5A6KX6GpTCZBoxa4JNULHyboJ1gjyrQtLokG88euwuJaOwdIOozxpaEIWTcuNpIldv4evAUBA=="}]
+[{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTEwIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSXNzdWVyIGNlcnRpZmljYXRlIDEtZmYwMDowOjExMCIsIm9wdGlvbmFsX2Rpc3RyaWJ1dGlvbl9wb2ludHMiOltdLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJUUWh5NG5FNGRjQm5zTkJkUUNiSE4wNGVveFBSRHZ4djkxMEUvSFFyei9jPSJ9LCJyZXZvY2F0aW9uIjp7ImtleV92ZXJzaW9uIjoyLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiUzJGb1plK3RGUzA3QlVsZXJQYkJhbjVRQVZ6Tk02RFQ3STlMWmtrRGFQOD0ifX0sImlzc3VlciI6eyJ0cmNfdmVyc2lvbiI6MX0sImNlcnRpZmljYXRlX3R5cGUiOiJpc3N1ZXIifQ","protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InRyYyIsInRyY192ZXJzaW9uIjoxLCJjcml0IjpbInR5cGUiLCJ0cmNfdmVyc2lvbiJdfQ","signature":"k0GLHNQJjByF8fFb-Mscv6bvwLObJSDq5RX3f9u1UFu7m_UMdpbuWRRksQNKWo7WBo7Xtj29WaqXmQBhLQm2AA"},{"payload":"eyJzdWJqZWN0IjoiMS1mZjAwOjA6MTExIiwidmVyc2lvbiI6MSwiZm9ybWF0X3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiQVMgY2VydGlmaWNhdGUgMS1mZjAwOjA6MTExIiwib3B0aW9uYWxfZGlzdHJpYnV0aW9uX3BvaW50cyI6W10sInZhbGlkaXR5Ijp7Im5vdF9iZWZvcmUiOjE1NzMwMzM3NjksIm5vdF9hZnRlciI6MTYwNDU2OTc2OX0sImtleXMiOnsiZW5jcnlwdGlvbiI6eyJrZXlfdmVyc2lvbiI6MiwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InRRNHdQaTAxc0FuNmJVSVRJcUFYS2FzcjA5SDltVlhsdEdEMHJXMEJQMVk9In0sInJldm9jYXRpb24iOnsia2V5X3ZlcnNpb24iOjIsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJYRGVNeTY4N2NGbTZQVnF5OWhXMVpQeFFFMkFDeEhrNkc5cmtGMmZyUzQ4PSJ9LCJzaWduaW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoieEhadS9hWURYTHR0V3BXVWlUVVhrbDVJUVNHeFp0dnZCYU5naGpPNXRKUT0ifX0sImlzc3VlciI6eyJpYSI6IjEtZmYwMDowOjExMCIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjF9LCJjZXJ0aWZpY2F0ZV90eXBlIjoiYXMifQ","protected":"eyJhbGciOiJlZDI1NTE5IiwiY3JpdCI6WyJ0eXBlIiwiY2VydGlmaWNhdGVfdmVyc2lvbiIsImlhIl0sInR5cGUiOiJjZXJ0aWZpY2F0ZSIsImNlcnRpZmljYXRlX3ZlcnNpb24iOjEsImlhIjoiMS1mZjAwOjA6MTEwIn0","signature":"bMPZwb0sLByit5A6KX6GpTCZBoxa4JNULHyboJ1gjyrQtLokG88euwuJaOwdIOozxpaEIWTcuNpIldv4evAUBA"}]
diff --git a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/trcs/ISD1-V1.trc b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/trcs/ISD1-V1.trc
index 3fc83f2ea..04f4b0a5a 100644
--- a/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/trcs/ISD1-V1.trc
+++ b/go/tools/scion-pki/internal/v2/certs/testdata/ISD1/trcs/ISD1-V1.trc
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS+IpgmguviTxdGKmTKx08H2/DpGIdBwy8TjMt2y4+vX7rlrhKe70uG1M2Dg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"MKRSaRpUlvDWKheCtpWbCEJ9+ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb+PjKprX3GPE1iLb52CLsnlTuBw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNakFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"gw1sLQ+u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc+YYC3WKcma4n58oFWpsa1lVxG9UQWg/oEjQ52tpvdHaAQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"3MkI9AL/ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx+MTpUzJDgUM/DAg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNekFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"+fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e+rwmzZCqF+/ZktIyuW+cD8y0+dRtK/IJgV+BQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"Zojh+2fHDELMt+BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg/a8/Bg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS-IpgmguviTxdGKmTKx08H2_DpGIdBwy8TjMt2y4-vX7rlrhKe70uG1M2Dg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"MKRSaRpUlvDWKheCtpWbCEJ9-ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb-PjKprX3GPE1iLb52CLsnlTuBw"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"gw1sLQ-u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc-YYC3WKcma4n58oFWpsa1lVxG9UQWg_oEjQ52tpvdHaAQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"3MkI9AL_ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx-MTpUzJDgUM_DAg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMzAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"-fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e-rwmzZCqF-_ZktIyuW-cD8y0-dRtK_IJgV-BQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"Zojh-2fHDELMt-BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg_a8_Bg"}]}
diff --git a/go/tools/scion-pki/internal/v2/tmpl/topo_test.go b/go/tools/scion-pki/internal/v2/tmpl/topo_test.go
index 2621592de..5da9a1981 100644
--- a/go/tools/scion-pki/internal/v2/tmpl/topo_test.go
+++ b/go/tools/scion-pki/internal/v2/tmpl/topo_test.go
@@ -138,7 +138,7 @@ func TestTopoGen(t *testing.T) {
 			cfg, err := conf.LoadAS(conf.ASFile(tmpDir, ia, 1))
 			require.NoError(t, err)
 
-			assert.Contains(t, cfg.Description, "Issuer certificate")
+			assert.Contains(t, cfg.Description, "AS certificate")
 			assert.Equal(t, scrypto.Version(1), cfg.Version)
 			assert.Equal(t, scrypto.KeyVersion(1), *cfg.SigningKeyVersion)
 			assert.Equal(t, scrypto.KeyVersion(1), *cfg.EncryptionKeyVersion)
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_110.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_110.sig
index 100eb94d5..92d7a3b8d 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_110.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_110.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS+IpgmguviTxdGKmTKx08H2/DpGIdBwy8TjMt2y4+vX7rlrhKe70uG1M2Dg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"MKRSaRpUlvDWKheCtpWbCEJ9+ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb+PjKprX3GPE1iLb52CLsnlTuBw=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS-IpgmguviTxdGKmTKx08H2_DpGIdBwy8TjMt2y4-vX7rlrhKe70uG1M2Dg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"MKRSaRpUlvDWKheCtpWbCEJ9-ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb-PjKprX3GPE1iLb52CLsnlTuBw"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_120.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_120.sig
index 0e21e5b83..6e0946809 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_120.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_120.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNakFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"gw1sLQ+u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc+YYC3WKcma4n58oFWpsa1lVxG9UQWg/oEjQ52tpvdHaAQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"3MkI9AL/ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"gw1sLQ-u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc-YYC3WKcma4n58oFWpsa1lVxG9UQWg_oEjQ52tpvdHaAQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"3MkI9AL_ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_130.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_130.sig
index 955c82f70..a68ebcbb0 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_130.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_130.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx+MTpUzJDgUM/DAg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNekFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"+fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e+rwmzZCqF+/ZktIyuW+cD8y0+dRtK/IJgV+BQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"Zojh+2fHDELMt+BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg/a8/Bg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx-MTpUzJDgUM_DAg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMzAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"-fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e-rwmzZCqF-_ZktIyuW-cD8y0-dRtK_IJgV-BQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"Zojh-2fHDELMt-BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg_a8_Bg"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_999.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_999.sig
index 93631fef3..b80e47471 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_999.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.1-ff00_0_999.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam94TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek5UWXpOemt3TENKdWIzUmZZV1owWlhJaU9qRTJNRFV3T1RrM09UQjlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWFYTnpkV2x1WnlJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltbHpjM1ZwYm1jaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSTNRek40WmxObWNYSjJZM000ZUVwc1NpdDBRMmNyZDJrNVRFeFRTbWxqV1d3dk0zbG5hakJSUTNjMFBTSjlMQ0p2Wm1ac2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pVkRWV2FrNVJaV2QzYzFaSlVFeHJOamhPYUdoSFJVdGhSVE4xUkhSQ2IwOUdNV0p3ZG5OUFZVTnZhejBpZlN3aWIyNXNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWF6Y3pWbWhXTW1RMVl6UlVTa3h3YjA1UVkzWlRUbkZZTTBSc1RuUnlZVlp2WWpCMmRuQjJXbkJFTUQwaWZYMTlmU3dpZG05MFpYTWlPbnQ5TENKd2NtOXZabDl2Wmw5d2IzTnpaWE56YVc5dUlqcDdJbVptTURBNk1Eb3hNVEFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"pFOHMdXm7bzBC4/vbBOiHUSIhyWpKXUCqPb0ntGwSfrkzLaaebYvoK5m3lPIHKFjOskcOcKSqRUKYTNH4kAXAw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"WHOGOCP5QAKnNmSHBKeEEPorCu7zoJoXu6U8OjpwIX7XK47TeKDZUVya+29p4ms0cn0ewV/bxCIbep87w6X0Dg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"M2aqVsHXzYVVJRBRTILiqMIuthwlCJp5HKl0M5EejEKBcj9TmnopRzj6odhnJ+rc3SpLVXmOsnktRNKl6ZhsDw=="}]}
+{"payload": "eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoxLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczNTYzNzkwLCJub3RfYWZ0ZXIiOjE2MDUwOTk3OTB9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiI3QzN4ZlNmcXJ2Y3M4eEpsSit0Q2crd2k5TExTSmljWWwvM3lnajBRQ3c0PSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiVDVWak5RZWd3c1ZJUExrNjhOaGhHRUthRTN1RHRCb09GMWJwdnNPVUNvaz0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoiazczVmhWMmQ1YzRUSkxwb05QY3ZTTnFYM0RsTnRyYVZvYjB2dnB2WnBEMD0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures": [{"protected": "eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature": "pFOHMdXm7bzBC4_vbBOiHUSIhyWpKXUCqPb0ntGwSfrkzLaaebYvoK5m3lPIHKFjOskcOcKSqRUKYTNH4kAXAw"},{"protected": "eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature": "WHOGOCP5QAKnNmSHBKeEEPorCu7zoJoXu6U8OjpwIX7XK47TeKDZUVya-29p4ms0cn0ewV_bxCIbep87w6X0Dg"},{"protected": "eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature": "M2aqVsHXzYVVJRBRTILiqMIuthwlCJp5HKl0M5EejEKBcj9TmnopRzj6odhnJ-rc3SpLVXmOsnktRNKl6ZhsDw"}]}
\ No newline at end of file
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.prototype b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.prototype
index c8607dbe2..a1ea72d04 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.prototype
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.parts/ISD1-V1.prototype
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":null}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":null}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.trc b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.trc
index 3fc83f2ea..04f4b0a5a 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.trc
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V1.trc
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3hMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam93TENKMGNuVnpkRjl5WlhObGRGOWhiR3h2ZDJWa0lqcDBjblZsTENKMllXeHBaR2wwZVNJNmV5SnViM1JmWW1WbWIzSmxJam94TlRjek1ETXpOelk1TENKdWIzUmZZV1owWlhJaU9qRTJNRFExTmprM05qbDlMQ0p3Y21sdFlYSjVYMkZ6WlhNaU9uc2labVl3TURvd09qRXhNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbWx6YzNWcGJtY2lMQ0oyYjNScGJtY2lYU3dpYTJWNWN5STZleUpwYzNOMWFXNW5JanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYXk5dVNrRlhPVFYzZVRWRmExZGtlbTFIYUVWR1UweG5TRUpKTm5WQmRuSkRSMGs1VjAxM1VVUTBNRDBpZlN3aWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkNSMHRSVTNCM1ZtNVNObTAxTlhsblJ6aEtNVll6VVhwcE1tTjJkbGh5VWtwSGRreHdjMlpOUTAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbWxQVXk4MmVIUXZSemQyVG5CNVdGQXlibnB1Y3pGcFJsbDFValoyUVRoeGFXRXhWWFo2ZFRKelNsVTlJbjE5ZlN3aVptWXdNRG93T2pFeU1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpZG05MGFXNW5JbDBzSW10bGVYTWlPbnNpYjJabWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxWUGIwdGtVa2t2YmtKRVNIbElOSGR6YmpoMmF6Rk1TbkZ6TjFkcFkyb3pia2xpZGk5VGEySklMMDA5SW4wc0ltOXViR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkluVkVhM0pOWW5OMlkyTTBjR3REZEZncmJXSkJSbGcxVXpNeFMwdDRaMUZaWldwNldIQnVZbXhCWVVVOUluMTlmU3dpWm1Zd01Eb3dPakV6TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1GMWRHaHZjbWwwWVhScGRtVWlMQ0pqYjNKbElpd2lhWE56ZFdsdVp5SXNJblp2ZEdsdVp5SmRMQ0pyWlhseklqcDdJbWx6YzNWcGJtY2lPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUpzWjNwQ2FteFZRWEV2TjFBNVVsQjJkRTVsUVRSek1qYzROMVV5TUc5MU0xSnNNRlp1ZGxZMlVYRnpQU0o5TENKdlptWnNhVzVsSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWFucDFjMXB5V1dOWU1VOUZUWE01VTJsVmJUQlJUREJHTDJkaVpXNVBhSFIyTXpGQlNVdDBaakIyVlQwaWZTd2liMjVzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhME53WWtOeGVscExOR3hhWkdWTFp6ZEhNRE5PWjA5S2VYZGpNRkpHY25neU5EaENWa0ZHWjNoall6MGlmWDE5ZlN3aWRtOTBaWE1pT250OUxDSndjbTl2Wmw5dlpsOXdiM056WlhOemFXOXVJanA3SW1abU1EQTZNRG94TVRBaU9sc2lhWE56ZFdsdVp5SXNJbTl1YkdsdVpTSXNJbTltWm14cGJtVWlYU3dpWm1Zd01Eb3dPakV5TUNJNld5SnZibXhwYm1VaUxDSnZabVpzYVc1bElsMHNJbVptTURBNk1Eb3hNekFpT2xzaWFYTnpkV2x1WnlJc0ltOXViR2x1WlNJc0ltOW1abXhwYm1VaVhYMTk=","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS+IpgmguviTxdGKmTKx08H2/DpGIdBwy8TjMt2y4+vX7rlrhKe70uG1M2Dg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEV3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"MKRSaRpUlvDWKheCtpWbCEJ9+ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb+PjKprX3GPE1iLb52CLsnlTuBw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNakFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"gw1sLQ+u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc+YYC3WKcma4n58oFWpsa1lVxG9UQWg/oEjQ52tpvdHaAQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVEl3SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"3MkI9AL/ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltbHpjM1ZwYm1jaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx+MTpUzJDgUM/DAg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam94TENKaGN5STZJbVptTURBNk1Eb3hNekFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"+fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e+rwmzZCqF+/ZktIyuW+cD8y0+dRtK/IJgV+BQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVN3aVlYTWlPaUptWmpBd09qQTZNVE13SWl3aVkzSnBkQ0k2V3lKMGVYQmxJaXdpYTJWNVgzUjVjR1VpTENKclpYbGZkbVZ5YzJsdmJpSXNJbUZ6SWwxOQ==","signature":"Zojh+2fHDELMt+BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg/a8/Bg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoxLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjowLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzNzY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk3Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImlPUy82eHQvRzd2TnB5WFAybnpuczFpRll1UjZ2QThxaWExVXZ6dTJzSlU9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnt9LCJwcm9vZl9vZl9wb3NzZXNzaW9uIjp7ImZmMDA6MDoxMTAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXSwiZmYwMDowOjEyMCI6WyJvbmxpbmUiLCJvZmZsaW5lIl0sImZmMDA6MDoxMzAiOlsiaXNzdWluZyIsIm9ubGluZSIsIm9mZmxpbmUiXX19","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"0efcIb72qqfzZLzrGzeFf3IIy1dZvX7lNU9vjs3iDq27knFwcSP2c5AOvn3xkikJ1We7MhJstD61hmU1LdBYCA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"AbxMcUfw69gQTqBpH9nlgMsF2KmS-IpgmguviTxdGKmTKx08H2_DpGIdBwy8TjMt2y4-vX7rlrhKe70uG1M2Dg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"MKRSaRpUlvDWKheCtpWbCEJ9-ShHBZlwqSf7lrDNDQMyeAPcs4SnuRQur5qb-PjKprX3GPE1iLb52CLsnlTuBw"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"gw1sLQ-u7cR9wNOapE0RebctSNlsdXyFoJYn0L9Zc-YYC3WKcma4n58oFWpsa1lVxG9UQWg_oEjQ52tpvdHaAQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"3MkI9AL_ecOVO2TrzdW5TL73dUPADRHu73FYiDJeALr7pBxj2OZOy1ZP4mPkEpUYSMWI64BACUYQWDB2LBp6BA"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Imlzc3VpbmciLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"RBtXVFxyYwPXbjFgGQYgTzN6rvJIf4Jup24bgy23h65rucAZwl9oM1JQtdUJhikJw78pKIx-MTpUzJDgUM_DAg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMzAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"-fa5wC9Y92meOtBU8mtpZn7rZgOrNKmRPUOnyYuYJYc2b4N2e-rwmzZCqF-_ZktIyuW-cD8y0-dRtK_IJgV-BQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"Zojh-2fHDELMt-BVmpdFk5OLFhnkj3j2M73UfqvvwYLBsV4ZsS9PufIZoVpkmYy43Ld35fCcVrY9qKOg_a8_Bg"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_110.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_110.sig
index ac578b74f..c78cd3125 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_110.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_110.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3lMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd01Dd2lkSEoxYzNSZmNtVnpaWFJmWVd4c2IzZGxaQ0k2ZEhKMVpTd2lkbUZzYVdScGRIa2lPbnNpYm05MFgySmxabTl5WlNJNk1UVTNNekF6TXpnMk9Td2libTkwWDJGbWRHVnlJam94TmpBME5UWTVPRFk1ZlN3aWNISnBiV0Z5ZVY5aGMyVnpJanA3SW1abU1EQTZNRG94TVRBaU9uc2lZWFIwY21saWRYUmxjeUk2V3lKcGMzTjFhVzVuSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWFYTnpkV2x1WnlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkltc3Zia3BCVnprMWQzazFSV3RYWkhwdFIyaEZSbE5NWjBoQ1NUWjFRWFp5UTBkSk9WZE5kMUZFTkRBOUluMHNJbTltWm14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUWtkTFVWTndkMVp1VWpadE5UVjVaMGM0U2pGV00xRjZhVEpqZG5aWWNsSktSM1pNY0hObVRVTk5QU0o5TENKdmJteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPaklzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKU1YyOTFia0l4ZVZkbE1rWmtVVmxSUjFRMWFrdFBWMU5hTDFCR2RWcFlSRU5PZVhWblNUWmxNbVU0UFNKOWZYMHNJbVptTURBNk1Eb3hNakFpT25zaVlYUjBjbWxpZFhSbGN5STZXeUpoZFhSb2IzSnBkR0YwYVhabElpd2lZMjl5WlNJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltOW1abXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSlZUMjlMWkZKSkwyNUNSRWg1U0RSM2MyNDRkbXN4VEVweGN6ZFhhV05xTTI1SlluWXZVMnRpU0M5TlBTSjlMQ0p2Ym14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUkd0eVRXSnpkbU5qTkhCclEzUllLMjFpUVVaWU5WTXpNVXRMZUdkUldXVnFlbGh3Ym1Kc1FXRkZQU0o5Zlgwc0ltWm1NREE2TURveE16QWlPbnNpWVhSMGNtbGlkWFJsY3lJNld5SmhkWFJvYjNKcGRHRjBhWFpsSWl3aVkyOXlaU0lzSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWJHZDZRbXBzVlVGeEx6ZFFPVkpRZG5ST1pVRTBjekkzT0RkVk1qQnZkVE5TYkRCV2JuWldObEZ4Y3owaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbXA2ZFhOYWNsbGpXREZQUlUxek9WTnBWVzB3VVV3d1JpOW5ZbVZ1VDJoMGRqTXhRVWxMZEdZd2RsVTlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW10RGNHSkRjWHBhU3pSc1dtUmxTMmMzUnpBelRtZFBTbmwzWXpCU1JuSjRNalE0UWxaQlJtZDRZMk05SW4xOWZYMHNJblp2ZEdWeklqcDdJbVptTURBNk1Eb3hNVEFpT25zaWEyVjVYM1I1Y0dVaU9pSnZabVpzYVc1bElpd2lhMlY1WDNabGNuTnBiMjRpT2pGOUxDSm1aakF3T2pBNk1USXdJanA3SW10bGVWOTBlWEJsSWpvaWIyNXNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZleUptWmpBd09qQTZNVEV3SWpwYkltOXViR2x1WlNKZGZYMA==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam95TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"MssFPBdqNk4xdr6P9aBg/xdJ30EyecJQWb1C3LPYKMl7wKnrR7j1sXDf//sAzfYvb4MndxLfsXtZ4od++dhOBw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRFd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"S0fYR72ZQWGhrSkN27lodzAk8dvRTQYezdM15tfHcFniDu8+DUIhDdtMjNTTv3S1rxDh/LrhSnbz+u+hNxCyDQ=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoyLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3MzAzMzg2OSwibm90X2FmdGVyIjoxNjA0NTY5ODY5fSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJpc3N1aW5nIiwidm90aW5nIl0sImtleXMiOnsiaXNzdWluZyI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImsvbkpBVzk1d3k1RWtXZHptR2hFRlNMZ0hCSTZ1QXZyQ0dJOVdNd1FENDA9In0sIm9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1QkdLUVNwd1ZuUjZtNTV5Z0c4SjFWM1F6aTJjdnZYclJKR3ZMcHNmTUNNPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjIsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJSV291bkIxeVdlMkZkUVlRR1Q1aktPV1NaL1BGdVpYRENOeXVnSTZlMmU4PSJ9fX0sImZmMDA6MDoxMjAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsInZvdGluZyJdLCJrZXlzIjp7Im9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJVT29LZFJJL25CREh5SDR3c244dmsxTEpxczdXaWNqM25JYnYvU2tiSC9NPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1RGtyTWJzdmNjNHBrQ3RYK21iQUZYNVMzMUtLeGdRWWVqelhwbmJsQWFFPSJ9fX0sImZmMDA6MDoxMzAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoibGd6QmpsVUFxLzdQOVJQdnROZUE0czI3ODdVMjBvdTNSbDBWbnZWNlFxcz0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Imp6dXNaclljWDFPRU1zOVNpVW0wUUwwRi9nYmVuT2h0djMxQUlLdGYwdlU9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImtDcGJDcXpaSzRsWmRlS2c3RzAzTmdPSnl3YzBSRnJ4MjQ4QlZBRmd4Y2M9In19fX0sInZvdGVzIjp7ImZmMDA6MDoxMTAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9LCJmZjAwOjA6MTIwIjp7ImtleV90eXBlIjoib25saW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6eyJmZjAwOjA6MTEwIjpbIm9ubGluZSJdfX0","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoyLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"MssFPBdqNk4xdr6P9aBg_xdJ30EyecJQWb1C3LPYKMl7wKnrR7j1sXDf__sAzfYvb4MndxLfsXtZ4od--dhOBw"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"S0fYR72ZQWGhrSkN27lodzAk8dvRTQYezdM15tfHcFniDu8-DUIhDdtMjNTTv3S1rxDh_LrhSnbz-u-hNxCyDQ"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_120.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_120.sig
index 2669ed931..00afbb3c8 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_120.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.1-ff00_0_120.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3lMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd01Dd2lkSEoxYzNSZmNtVnpaWFJmWVd4c2IzZGxaQ0k2ZEhKMVpTd2lkbUZzYVdScGRIa2lPbnNpYm05MFgySmxabTl5WlNJNk1UVTNNekF6TXpnMk9Td2libTkwWDJGbWRHVnlJam94TmpBME5UWTVPRFk1ZlN3aWNISnBiV0Z5ZVY5aGMyVnpJanA3SW1abU1EQTZNRG94TVRBaU9uc2lZWFIwY21saWRYUmxjeUk2V3lKcGMzTjFhVzVuSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWFYTnpkV2x1WnlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkltc3Zia3BCVnprMWQzazFSV3RYWkhwdFIyaEZSbE5NWjBoQ1NUWjFRWFp5UTBkSk9WZE5kMUZFTkRBOUluMHNJbTltWm14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUWtkTFVWTndkMVp1VWpadE5UVjVaMGM0U2pGV00xRjZhVEpqZG5aWWNsSktSM1pNY0hObVRVTk5QU0o5TENKdmJteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPaklzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKU1YyOTFia0l4ZVZkbE1rWmtVVmxSUjFRMWFrdFBWMU5hTDFCR2RWcFlSRU5PZVhWblNUWmxNbVU0UFNKOWZYMHNJbVptTURBNk1Eb3hNakFpT25zaVlYUjBjbWxpZFhSbGN5STZXeUpoZFhSb2IzSnBkR0YwYVhabElpd2lZMjl5WlNJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltOW1abXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSlZUMjlMWkZKSkwyNUNSRWg1U0RSM2MyNDRkbXN4VEVweGN6ZFhhV05xTTI1SlluWXZVMnRpU0M5TlBTSjlMQ0p2Ym14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUkd0eVRXSnpkbU5qTkhCclEzUllLMjFpUVVaWU5WTXpNVXRMZUdkUldXVnFlbGh3Ym1Kc1FXRkZQU0o5Zlgwc0ltWm1NREE2TURveE16QWlPbnNpWVhSMGNtbGlkWFJsY3lJNld5SmhkWFJvYjNKcGRHRjBhWFpsSWl3aVkyOXlaU0lzSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWJHZDZRbXBzVlVGeEx6ZFFPVkpRZG5ST1pVRTBjekkzT0RkVk1qQnZkVE5TYkRCV2JuWldObEZ4Y3owaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbXA2ZFhOYWNsbGpXREZQUlUxek9WTnBWVzB3VVV3d1JpOW5ZbVZ1VDJoMGRqTXhRVWxMZEdZd2RsVTlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW10RGNHSkRjWHBhU3pSc1dtUmxTMmMzUnpBelRtZFBTbmwzWXpCU1JuSjRNalE0UWxaQlJtZDRZMk05SW4xOWZYMHNJblp2ZEdWeklqcDdJbVptTURBNk1Eb3hNVEFpT25zaWEyVjVYM1I1Y0dVaU9pSnZabVpzYVc1bElpd2lhMlY1WDNabGNuTnBiMjRpT2pGOUxDSm1aakF3T2pBNk1USXdJanA3SW10bGVWOTBlWEJsSWpvaWIyNXNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZleUptWmpBd09qQTZNVEV3SWpwYkltOXViR2x1WlNKZGZYMA==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTl1YkdsdVpTSXNJbXRsZVY5MlpYSnphVzl1SWpveExDSmhjeUk2SW1abU1EQTZNRG94TWpBaUxDSmpjbWwwSWpwYkluUjVjR1VpTENKclpYbGZkSGx3WlNJc0ltdGxlVjkyWlhKemFXOXVJaXdpWVhNaVhYMA==","signature":"QSf0J9v/QPxdY/4lw0VCwdGfxQ4JASem++IJpF3Wmc3PHMP6f+316rTHcvDdHUKrHWcitNuhSArQGqrPN7/+Aw=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoyLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3MzAzMzg2OSwibm90X2FmdGVyIjoxNjA0NTY5ODY5fSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJpc3N1aW5nIiwidm90aW5nIl0sImtleXMiOnsiaXNzdWluZyI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImsvbkpBVzk1d3k1RWtXZHptR2hFRlNMZ0hCSTZ1QXZyQ0dJOVdNd1FENDA9In0sIm9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1QkdLUVNwd1ZuUjZtNTV5Z0c4SjFWM1F6aTJjdnZYclJKR3ZMcHNmTUNNPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjIsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJSV291bkIxeVdlMkZkUVlRR1Q1aktPV1NaL1BGdVpYRENOeXVnSTZlMmU4PSJ9fX0sImZmMDA6MDoxMjAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsInZvdGluZyJdLCJrZXlzIjp7Im9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJVT29LZFJJL25CREh5SDR3c244dmsxTEpxczdXaWNqM25JYnYvU2tiSC9NPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1RGtyTWJzdmNjNHBrQ3RYK21iQUZYNVMzMUtLeGdRWWVqelhwbmJsQWFFPSJ9fX0sImZmMDA6MDoxMzAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoibGd6QmpsVUFxLzdQOVJQdnROZUE0czI3ODdVMjBvdTNSbDBWbnZWNlFxcz0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Imp6dXNaclljWDFPRU1zOVNpVW0wUUwwRi9nYmVuT2h0djMxQUlLdGYwdlU9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImtDcGJDcXpaSzRsWmRlS2c3RzAzTmdPSnl3YzBSRnJ4MjQ4QlZBRmd4Y2M9In19fX0sInZvdGVzIjp7ImZmMDA6MDoxMTAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9LCJmZjAwOjA6MTIwIjp7ImtleV90eXBlIjoib25saW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6eyJmZjAwOjA6MTEwIjpbIm9ubGluZSJdfX0","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"QSf0J9v_QPxdY_4lw0VCwdGfxQ4JASem--IJpF3Wmc3PHMP6f-316rTHcvDdHUKrHWcitNuhSArQGqrPN7_-Aw"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.prototype b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.prototype
index 3eea2eb62..874929489 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.prototype
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.parts/ISD1-V2.prototype
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3lMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd01Dd2lkSEoxYzNSZmNtVnpaWFJmWVd4c2IzZGxaQ0k2ZEhKMVpTd2lkbUZzYVdScGRIa2lPbnNpYm05MFgySmxabTl5WlNJNk1UVTNNekF6TXpnMk9Td2libTkwWDJGbWRHVnlJam94TmpBME5UWTVPRFk1ZlN3aWNISnBiV0Z5ZVY5aGMyVnpJanA3SW1abU1EQTZNRG94TVRBaU9uc2lZWFIwY21saWRYUmxjeUk2V3lKcGMzTjFhVzVuSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWFYTnpkV2x1WnlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkltc3Zia3BCVnprMWQzazFSV3RYWkhwdFIyaEZSbE5NWjBoQ1NUWjFRWFp5UTBkSk9WZE5kMUZFTkRBOUluMHNJbTltWm14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUWtkTFVWTndkMVp1VWpadE5UVjVaMGM0U2pGV00xRjZhVEpqZG5aWWNsSktSM1pNY0hObVRVTk5QU0o5TENKdmJteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPaklzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKU1YyOTFia0l4ZVZkbE1rWmtVVmxSUjFRMWFrdFBWMU5hTDFCR2RWcFlSRU5PZVhWblNUWmxNbVU0UFNKOWZYMHNJbVptTURBNk1Eb3hNakFpT25zaVlYUjBjbWxpZFhSbGN5STZXeUpoZFhSb2IzSnBkR0YwYVhabElpd2lZMjl5WlNJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltOW1abXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSlZUMjlMWkZKSkwyNUNSRWg1U0RSM2MyNDRkbXN4VEVweGN6ZFhhV05xTTI1SlluWXZVMnRpU0M5TlBTSjlMQ0p2Ym14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUkd0eVRXSnpkbU5qTkhCclEzUllLMjFpUVVaWU5WTXpNVXRMZUdkUldXVnFlbGh3Ym1Kc1FXRkZQU0o5Zlgwc0ltWm1NREE2TURveE16QWlPbnNpWVhSMGNtbGlkWFJsY3lJNld5SmhkWFJvYjNKcGRHRjBhWFpsSWl3aVkyOXlaU0lzSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWJHZDZRbXBzVlVGeEx6ZFFPVkpRZG5ST1pVRTBjekkzT0RkVk1qQnZkVE5TYkRCV2JuWldObEZ4Y3owaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbXA2ZFhOYWNsbGpXREZQUlUxek9WTnBWVzB3VVV3d1JpOW5ZbVZ1VDJoMGRqTXhRVWxMZEdZd2RsVTlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW10RGNHSkRjWHBhU3pSc1dtUmxTMmMzUnpBelRtZFBTbmwzWXpCU1JuSjRNalE0UWxaQlJtZDRZMk05SW4xOWZYMHNJblp2ZEdWeklqcDdJbVptTURBNk1Eb3hNVEFpT25zaWEyVjVYM1I1Y0dVaU9pSnZabVpzYVc1bElpd2lhMlY1WDNabGNuTnBiMjRpT2pGOUxDSm1aakF3T2pBNk1USXdJanA3SW10bGVWOTBlWEJsSWpvaWIyNXNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZleUptWmpBd09qQTZNVEV3SWpwYkltOXViR2x1WlNKZGZYMA==","signatures":null}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoyLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3MzAzMzg2OSwibm90X2FmdGVyIjoxNjA0NTY5ODY5fSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJpc3N1aW5nIiwidm90aW5nIl0sImtleXMiOnsiaXNzdWluZyI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImsvbkpBVzk1d3k1RWtXZHptR2hFRlNMZ0hCSTZ1QXZyQ0dJOVdNd1FENDA9In0sIm9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1QkdLUVNwd1ZuUjZtNTV5Z0c4SjFWM1F6aTJjdnZYclJKR3ZMcHNmTUNNPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjIsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJSV291bkIxeVdlMkZkUVlRR1Q1aktPV1NaL1BGdVpYRENOeXVnSTZlMmU4PSJ9fX0sImZmMDA6MDoxMjAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsInZvdGluZyJdLCJrZXlzIjp7Im9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJVT29LZFJJL25CREh5SDR3c244dmsxTEpxczdXaWNqM25JYnYvU2tiSC9NPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1RGtyTWJzdmNjNHBrQ3RYK21iQUZYNVMzMUtLeGdRWWVqelhwbmJsQWFFPSJ9fX0sImZmMDA6MDoxMzAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoibGd6QmpsVUFxLzdQOVJQdnROZUE0czI3ODdVMjBvdTNSbDBWbnZWNlFxcz0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Imp6dXNaclljWDFPRU1zOVNpVW0wUUwwRi9nYmVuT2h0djMxQUlLdGYwdlU9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImtDcGJDcXpaSzRsWmRlS2c3RzAzTmdPSnl3YzBSRnJ4MjQ4QlZBRmd4Y2M9In19fX0sInZvdGVzIjp7ImZmMDA6MDoxMTAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9LCJmZjAwOjA6MTIwIjp7ImtleV90eXBlIjoib25saW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6eyJmZjAwOjA6MTEwIjpbIm9ubGluZSJdfX0","signatures":null}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.trc b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.trc
index 50b584e9f..4b6b52674 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.trc
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V2.trc
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3lMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam95TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam96TmpBd01Dd2lkSEoxYzNSZmNtVnpaWFJmWVd4c2IzZGxaQ0k2ZEhKMVpTd2lkbUZzYVdScGRIa2lPbnNpYm05MFgySmxabTl5WlNJNk1UVTNNekF6TXpnMk9Td2libTkwWDJGbWRHVnlJam94TmpBME5UWTVPRFk1ZlN3aWNISnBiV0Z5ZVY5aGMyVnpJanA3SW1abU1EQTZNRG94TVRBaU9uc2lZWFIwY21saWRYUmxjeUk2V3lKcGMzTjFhVzVuSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWFYTnpkV2x1WnlJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNkltc3Zia3BCVnprMWQzazFSV3RYWkhwdFIyaEZSbE5NWjBoQ1NUWjFRWFp5UTBkSk9WZE5kMUZFTkRBOUluMHNJbTltWm14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUWtkTFVWTndkMVp1VWpadE5UVjVaMGM0U2pGV00xRjZhVEpqZG5aWWNsSktSM1pNY0hObVRVTk5QU0o5TENKdmJteHBibVVpT25zaWEyVjVYM1psY25OcGIyNGlPaklzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKU1YyOTFia0l4ZVZkbE1rWmtVVmxSUjFRMWFrdFBWMU5hTDFCR2RWcFlSRU5PZVhWblNUWmxNbVU0UFNKOWZYMHNJbVptTURBNk1Eb3hNakFpT25zaVlYUjBjbWxpZFhSbGN5STZXeUpoZFhSb2IzSnBkR0YwYVhabElpd2lZMjl5WlNJc0luWnZkR2x1WnlKZExDSnJaWGx6SWpwN0ltOW1abXhwYm1VaU9uc2lhMlY1WDNabGNuTnBiMjRpT2pFc0ltRnNaMjl5YVhSb2JTSTZJbVZrTWpVMU1Ua2lMQ0pyWlhraU9pSlZUMjlMWkZKSkwyNUNSRWg1U0RSM2MyNDRkbXN4VEVweGN6ZFhhV05xTTI1SlluWXZVMnRpU0M5TlBTSjlMQ0p2Ym14cGJtVWlPbnNpYTJWNVgzWmxjbk5wYjI0aU9qRXNJbUZzWjI5eWFYUm9iU0k2SW1Wa01qVTFNVGtpTENKclpYa2lPaUoxUkd0eVRXSnpkbU5qTkhCclEzUllLMjFpUVVaWU5WTXpNVXRMZUdkUldXVnFlbGh3Ym1Kc1FXRkZQU0o5Zlgwc0ltWm1NREE2TURveE16QWlPbnNpWVhSMGNtbGlkWFJsY3lJNld5SmhkWFJvYjNKcGRHRjBhWFpsSWl3aVkyOXlaU0lzSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWJHZDZRbXBzVlVGeEx6ZFFPVkpRZG5ST1pVRTBjekkzT0RkVk1qQnZkVE5TYkRCV2JuWldObEZ4Y3owaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJbXA2ZFhOYWNsbGpXREZQUlUxek9WTnBWVzB3VVV3d1JpOW5ZbVZ1VDJoMGRqTXhRVWxMZEdZd2RsVTlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNU3dpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SW10RGNHSkRjWHBhU3pSc1dtUmxTMmMzUnpBelRtZFBTbmwzWXpCU1JuSjRNalE0UWxaQlJtZDRZMk05SW4xOWZYMHNJblp2ZEdWeklqcDdJbVptTURBNk1Eb3hNVEFpT25zaWEyVjVYM1I1Y0dVaU9pSnZabVpzYVc1bElpd2lhMlY1WDNabGNuTnBiMjRpT2pGOUxDSm1aakF3T2pBNk1USXdJanA3SW10bGVWOTBlWEJsSWpvaWIyNXNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZleUptWmpBd09qQTZNVEV3SWpwYkltOXViR2x1WlNKZGZYMA==","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJbkJ5YjI5bVgyOW1YM0J2YzNObGMzTnBiMjRpTENKclpYbGZkSGx3WlNJNkltOXViR2x1WlNJc0ltdGxlVjkyWlhKemFXOXVJam95TENKaGN5STZJbVptTURBNk1Eb3hNVEFpTENKamNtbDBJanBiSW5SNWNHVWlMQ0pyWlhsZmRIbHdaU0lzSW10bGVWOTJaWEp6YVc5dUlpd2lZWE1pWFgw","signature":"MssFPBdqNk4xdr6P9aBg/xdJ30EyecJQWb1C3LPYKMl7wKnrR7j1sXDf//sAzfYvb4MndxLfsXtZ4od++dhOBw=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRFd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"S0fYR72ZQWGhrSkN27lodzAk8dvRTQYezdM15tfHcFniDu8+DUIhDdtMjNTTv3S1rxDh/LrhSnbz+u+hNxCyDQ=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTl1YkdsdVpTSXNJbXRsZVY5MlpYSnphVzl1SWpveExDSmhjeUk2SW1abU1EQTZNRG94TWpBaUxDSmpjbWwwSWpwYkluUjVjR1VpTENKclpYbGZkSGx3WlNJc0ltdGxlVjkyWlhKemFXOXVJaXdpWVhNaVhYMA==","signature":"QSf0J9v/QPxdY/4lw0VCwdGfxQ4JASem++IJpF3Wmc3PHMP6f+316rTHcvDdHUKrHWcitNuhSArQGqrPN7/+Aw=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjoyLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoyLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjozNjAwMCwidHJ1c3RfcmVzZXRfYWxsb3dlZCI6dHJ1ZSwidmFsaWRpdHkiOnsibm90X2JlZm9yZSI6MTU3MzAzMzg2OSwibm90X2FmdGVyIjoxNjA0NTY5ODY5fSwicHJpbWFyeV9hc2VzIjp7ImZmMDA6MDoxMTAiOnsiYXR0cmlidXRlcyI6WyJpc3N1aW5nIiwidm90aW5nIl0sImtleXMiOnsiaXNzdWluZyI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImsvbkpBVzk1d3k1RWtXZHptR2hFRlNMZ0hCSTZ1QXZyQ0dJOVdNd1FENDA9In0sIm9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1QkdLUVNwd1ZuUjZtNTV5Z0c4SjFWM1F6aTJjdnZYclJKR3ZMcHNmTUNNPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjIsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJSV291bkIxeVdlMkZkUVlRR1Q1aktPV1NaL1BGdVpYRENOeXVnSTZlMmU4PSJ9fX0sImZmMDA6MDoxMjAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsInZvdGluZyJdLCJrZXlzIjp7Im9mZmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJVT29LZFJJL25CREh5SDR3c244dmsxTEpxczdXaWNqM25JYnYvU2tiSC9NPSJ9LCJvbmxpbmUiOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJ1RGtyTWJzdmNjNHBrQ3RYK21iQUZYNVMzMUtLeGdRWWVqelhwbmJsQWFFPSJ9fX0sImZmMDA6MDoxMzAiOnsiYXR0cmlidXRlcyI6WyJhdXRob3JpdGF0aXZlIiwiY29yZSIsImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5IjoibGd6QmpsVUFxLzdQOVJQdnROZUE0czI3ODdVMjBvdTNSbDBWbnZWNlFxcz0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6Imp6dXNaclljWDFPRU1zOVNpVW0wUUwwRi9nYmVuT2h0djMxQUlLdGYwdlU9In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6ImtDcGJDcXpaSzRsWmRlS2c3RzAzTmdPSnl3YzBSRnJ4MjQ4QlZBRmd4Y2M9In19fX0sInZvdGVzIjp7ImZmMDA6MDoxMTAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9LCJmZjAwOjA6MTIwIjp7ImtleV90eXBlIjoib25saW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6eyJmZjAwOjA6MTEwIjpbIm9ubGluZSJdfX0","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InByb29mX29mX3Bvc3Nlc3Npb24iLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoyLCJhcyI6ImZmMDA6MDoxMTAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"MssFPBdqNk4xdr6P9aBg_xdJ30EyecJQWb1C3LPYKMl7wKnrR7j1sXDf__sAzfYvb4MndxLfsXtZ4od--dhOBw"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTEwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"S0fYR72ZQWGhrSkN27lodzAk8dvRTQYezdM15tfHcFniDu8-DUIhDdtMjNTTv3S1rxDh_LrhSnbz-u-hNxCyDQ"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9ubGluZSIsImtleV92ZXJzaW9uIjoxLCJhcyI6ImZmMDA6MDoxMjAiLCJjcml0IjpbInR5cGUiLCJrZXlfdHlwZSIsImtleV92ZXJzaW9uIiwiYXMiXX0","signature":"QSf0J9v_QPxdY_4lw0VCwdGfxQ4JASem--IJpF3Wmc3PHMP6f-316rTHcvDdHUKrHWcitNuhSArQGqrPN7_-Aw"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_120.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_120.sig
index dac34609c..c40de5588 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_120.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_120.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3pMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam94TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam8zTWpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16T1RZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazVOamw5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakV4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWF5OXVTa0ZYT1RWM2VUVkZhMWRrZW0xSGFFVkdVMHhuU0VKSk5uVkJkbkpEUjBrNVYwMTNVVVEwTUQwaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZDUjB0UlUzQjNWbTVTTm0wMU5YbG5SemhLTVZZelVYcHBNbU4yZGxoeVVrcEhka3h3YzJaTlEwMDlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNaXdpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxKWGIzVnVRakY1VjJVeVJtUlJXVkZIVkRWcVMwOVhVMW92VUVaMVdsaEVRMDU1ZFdkSk5tVXlaVGc5SW4xOWZTd2labVl3TURvd09qRXlNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklsVlBiMHRrVWtrdmJrSkVTSGxJTkhkemJqaDJhekZNU25Gek4xZHBZMm96YmtsaWRpOVRhMkpJTDAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZFYTNKTlluTjJZMk0wY0d0RGRGZ3JiV0pCUmxnMVV6TXhTMHQ0WjFGWlpXcDZXSEJ1WW14QllVVTlJbjE5ZlN3aVptWXdNRG93T2pFek1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpYVhOemRXbHVaeUlzSW5admRHbHVaeUpkTENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKc1ozcENhbXhWUVhFdk4xQTVVbEIyZEU1bFFUUnpNamM0TjFVeU1HOTFNMUpzTUZadWRsWTJVWEZ6UFNKOUxDSnZabVpzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhbnAxYzFweVdXTllNVTlGVFhNNVUybFZiVEJSVERCR0wyZGlaVzVQYUhSMk16RkJTVXQwWmpCMlZUMGlmU3dpYjI1c2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYTBOd1lrTnhlbHBMTkd4YVpHVkxaemRITUROT1owOUtlWGRqTUZKR2NuZ3lORGhDVmtGR1ozaGpZejBpZlgxOWZTd2lkbTkwWlhNaU9uc2labVl3TURvd09qRXlNQ0k2ZXlKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVgwc0ltWm1NREE2TURveE16QWlPbnNpYTJWNVgzUjVjR1VpT2lKdlptWnNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZlMzE5","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRJd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"SdH+eYVBEkoUxFBVgcWgyUqx5lhjIT6odBc+TNpXyGjX6LbrVMGt0v6NXPEAhncSOmc4ZkeijWZ3yGgYkpUMCg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjozLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoxLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjo3MjAwLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzOTY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk5Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MiwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlJXb3VuQjF5V2UyRmRRWVFHVDVqS09XU1ovUEZ1WlhEQ055dWdJNmUyZTg9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnsiZmYwMDowOjEyMCI6eyJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MX0sImZmMDA6MDoxMzAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6e319","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"SdH-eYVBEkoUxFBVgcWgyUqx5lhjIT6odBc-TNpXyGjX6LbrVMGt0v6NXPEAhncSOmc4ZkeijWZ3yGgYkpUMCg"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_130.sig b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_130.sig
index 0c27a8aaf..15a04302d 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_130.sig
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.1-ff00_0_130.sig
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3pMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam94TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam8zTWpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16T1RZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazVOamw5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakV4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWF5OXVTa0ZYT1RWM2VUVkZhMWRrZW0xSGFFVkdVMHhuU0VKSk5uVkJkbkpEUjBrNVYwMTNVVVEwTUQwaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZDUjB0UlUzQjNWbTVTTm0wMU5YbG5SemhLTVZZelVYcHBNbU4yZGxoeVVrcEhka3h3YzJaTlEwMDlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNaXdpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxKWGIzVnVRakY1VjJVeVJtUlJXVkZIVkRWcVMwOVhVMW92VUVaMVdsaEVRMDU1ZFdkSk5tVXlaVGc5SW4xOWZTd2labVl3TURvd09qRXlNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklsVlBiMHRrVWtrdmJrSkVTSGxJTkhkemJqaDJhekZNU25Gek4xZHBZMm96YmtsaWRpOVRhMkpJTDAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZFYTNKTlluTjJZMk0wY0d0RGRGZ3JiV0pCUmxnMVV6TXhTMHQ0WjFGWlpXcDZXSEJ1WW14QllVVTlJbjE5ZlN3aVptWXdNRG93T2pFek1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpYVhOemRXbHVaeUlzSW5admRHbHVaeUpkTENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKc1ozcENhbXhWUVhFdk4xQTVVbEIyZEU1bFFUUnpNamM0TjFVeU1HOTFNMUpzTUZadWRsWTJVWEZ6UFNKOUxDSnZabVpzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhbnAxYzFweVdXTllNVTlGVFhNNVUybFZiVEJSVERCR0wyZGlaVzVQYUhSMk16RkJTVXQwWmpCMlZUMGlmU3dpYjI1c2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYTBOd1lrTnhlbHBMTkd4YVpHVkxaemRITUROT1owOUtlWGRqTUZKR2NuZ3lORGhDVmtGR1ozaGpZejBpZlgxOWZTd2lkbTkwWlhNaU9uc2labVl3TURvd09qRXlNQ0k2ZXlKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVgwc0ltWm1NREE2TURveE16QWlPbnNpYTJWNVgzUjVjR1VpT2lKdlptWnNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZlMzE5","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRNd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"ruX0+fCYTugNPxGr6qLTCuEidS8tJ5nVlREba5T8jrfReOGLTlHoWjoxrHYredg/UpTcAghANROVfEaBa0mhCg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjozLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoxLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjo3MjAwLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzOTY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk5Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MiwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlJXb3VuQjF5V2UyRmRRWVFHVDVqS09XU1ovUEZ1WlhEQ055dWdJNmUyZTg9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnsiZmYwMDowOjEyMCI6eyJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MX0sImZmMDA6MDoxMzAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6e319","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"ruX0-fCYTugNPxGr6qLTCuEidS8tJ5nVlREba5T8jrfReOGLTlHoWjoxrHYredg_UpTcAghANROVfEaBa0mhCg"}]}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.prototype b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.prototype
index 0ea3ed2d2..0bed5136f 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.prototype
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.parts/ISD1-V3.prototype
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3pMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam94TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam8zTWpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16T1RZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazVOamw5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakV4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWF5OXVTa0ZYT1RWM2VUVkZhMWRrZW0xSGFFVkdVMHhuU0VKSk5uVkJkbkpEUjBrNVYwMTNVVVEwTUQwaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZDUjB0UlUzQjNWbTVTTm0wMU5YbG5SemhLTVZZelVYcHBNbU4yZGxoeVVrcEhka3h3YzJaTlEwMDlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNaXdpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxKWGIzVnVRakY1VjJVeVJtUlJXVkZIVkRWcVMwOVhVMW92VUVaMVdsaEVRMDU1ZFdkSk5tVXlaVGc5SW4xOWZTd2labVl3TURvd09qRXlNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklsVlBiMHRrVWtrdmJrSkVTSGxJTkhkemJqaDJhekZNU25Gek4xZHBZMm96YmtsaWRpOVRhMkpJTDAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZFYTNKTlluTjJZMk0wY0d0RGRGZ3JiV0pCUmxnMVV6TXhTMHQ0WjFGWlpXcDZXSEJ1WW14QllVVTlJbjE5ZlN3aVptWXdNRG93T2pFek1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpYVhOemRXbHVaeUlzSW5admRHbHVaeUpkTENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKc1ozcENhbXhWUVhFdk4xQTVVbEIyZEU1bFFUUnpNamM0TjFVeU1HOTFNMUpzTUZadWRsWTJVWEZ6UFNKOUxDSnZabVpzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhbnAxYzFweVdXTllNVTlGVFhNNVUybFZiVEJSVERCR0wyZGlaVzVQYUhSMk16RkJTVXQwWmpCMlZUMGlmU3dpYjI1c2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYTBOd1lrTnhlbHBMTkd4YVpHVkxaemRITUROT1owOUtlWGRqTUZKR2NuZ3lORGhDVmtGR1ozaGpZejBpZlgxOWZTd2lkbTkwWlhNaU9uc2labVl3TURvd09qRXlNQ0k2ZXlKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVgwc0ltWm1NREE2TURveE16QWlPbnNpYTJWNVgzUjVjR1VpT2lKdlptWnNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZlMzE5","signatures":null}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjozLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoxLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjo3MjAwLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzOTY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk5Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MiwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlJXb3VuQjF5V2UyRmRRWVFHVDVqS09XU1ovUEZ1WlhEQ055dWdJNmUyZTg9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnsiZmYwMDowOjEyMCI6eyJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MX0sImZmMDA6MDoxMzAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6e319","signatures":null}
diff --git a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.trc b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.trc
index f33312df9..67f288f03 100644
--- a/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.trc
+++ b/go/tools/scion-pki/internal/v2/trcs/testdata/ISD1/trcs/ISD1-V3.trc
@@ -1,1 +1,1 @@
-{"payload":"ZXlKcGMyUWlPakVzSW5SeVkxOTJaWEp6YVc5dUlqb3pMQ0ppWVhObFgzWmxjbk5wYjI0aU9qRXNJbVJsYzJOeWFYQjBhVzl1SWpvaVNWTkVJREVpTENKMmIzUnBibWRmY1hWdmNuVnRJam94TENKbWIzSnRZWFJmZG1WeWMybHZiaUk2TVN3aVozSmhZMlZmY0dWeWFXOWtJam8zTWpBd0xDSjBjblZ6ZEY5eVpYTmxkRjloYkd4dmQyVmtJanAwY25WbExDSjJZV3hwWkdsMGVTSTZleUp1YjNSZlltVm1iM0psSWpveE5UY3pNRE16T1RZNUxDSnViM1JmWVdaMFpYSWlPakUyTURRMU5qazVOamw5TENKd2NtbHRZWEo1WDJGelpYTWlPbnNpWm1Zd01Eb3dPakV4TUNJNmV5SmhkSFJ5YVdKMWRHVnpJanBiSW1semMzVnBibWNpTENKMmIzUnBibWNpWFN3aWEyVjVjeUk2ZXlKcGMzTjFhVzVuSWpwN0ltdGxlVjkyWlhKemFXOXVJam94TENKaGJHZHZjbWwwYUcwaU9pSmxaREkxTlRFNUlpd2lhMlY1SWpvaWF5OXVTa0ZYT1RWM2VUVkZhMWRrZW0xSGFFVkdVMHhuU0VKSk5uVkJkbkpEUjBrNVYwMTNVVVEwTUQwaWZTd2liMlptYkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZDUjB0UlUzQjNWbTVTTm0wMU5YbG5SemhLTVZZelVYcHBNbU4yZGxoeVVrcEhka3h3YzJaTlEwMDlJbjBzSW05dWJHbHVaU0k2ZXlKclpYbGZkbVZ5YzJsdmJpSTZNaXdpWVd4bmIzSnBkR2h0SWpvaVpXUXlOVFV4T1NJc0ltdGxlU0k2SWxKWGIzVnVRakY1VjJVeVJtUlJXVkZIVkRWcVMwOVhVMW92VUVaMVdsaEVRMDU1ZFdkSk5tVXlaVGc5SW4xOWZTd2labVl3TURvd09qRXlNQ0k2ZXlKaGRIUnlhV0oxZEdWeklqcGJJbUYxZEdodmNtbDBZWFJwZG1VaUxDSmpiM0psSWl3aWRtOTBhVzVuSWwwc0ltdGxlWE1pT25zaWIyWm1iR2x1WlNJNmV5SnJaWGxmZG1WeWMybHZiaUk2TVN3aVlXeG5iM0pwZEdodElqb2laV1F5TlRVeE9TSXNJbXRsZVNJNklsVlBiMHRrVWtrdmJrSkVTSGxJTkhkemJqaDJhekZNU25Gek4xZHBZMm96YmtsaWRpOVRhMkpJTDAwOUluMHNJbTl1YkdsdVpTSTZleUpyWlhsZmRtVnljMmx2YmlJNk1Td2lZV3huYjNKcGRHaHRJam9pWldReU5UVXhPU0lzSW10bGVTSTZJblZFYTNKTlluTjJZMk0wY0d0RGRGZ3JiV0pCUmxnMVV6TXhTMHQ0WjFGWlpXcDZXSEJ1WW14QllVVTlJbjE5ZlN3aVptWXdNRG93T2pFek1DSTZleUpoZEhSeWFXSjFkR1Z6SWpwYkltRjFkR2h2Y21sMFlYUnBkbVVpTENKamIzSmxJaXdpYVhOemRXbHVaeUlzSW5admRHbHVaeUpkTENKclpYbHpJanA3SW1semMzVnBibWNpT25zaWEyVjVYM1psY25OcGIyNGlPakVzSW1Gc1oyOXlhWFJvYlNJNkltVmtNalUxTVRraUxDSnJaWGtpT2lKc1ozcENhbXhWUVhFdk4xQTVVbEIyZEU1bFFUUnpNamM0TjFVeU1HOTFNMUpzTUZadWRsWTJVWEZ6UFNKOUxDSnZabVpzYVc1bElqcDdJbXRsZVY5MlpYSnphVzl1SWpveExDSmhiR2R2Y21sMGFHMGlPaUpsWkRJMU5URTVJaXdpYTJWNUlqb2lhbnAxYzFweVdXTllNVTlGVFhNNVUybFZiVEJSVERCR0wyZGlaVzVQYUhSMk16RkJTVXQwWmpCMlZUMGlmU3dpYjI1c2FXNWxJanA3SW10bGVWOTJaWEp6YVc5dUlqb3hMQ0poYkdkdmNtbDBhRzBpT2lKbFpESTFOVEU1SWl3aWEyVjVJam9pYTBOd1lrTnhlbHBMTkd4YVpHVkxaemRITUROT1owOUtlWGRqTUZKR2NuZ3lORGhDVmtGR1ozaGpZejBpZlgxOWZTd2lkbTkwWlhNaU9uc2labVl3TURvd09qRXlNQ0k2ZXlKclpYbGZkSGx3WlNJNkltOW1abXhwYm1VaUxDSnJaWGxmZG1WeWMybHZiaUk2TVgwc0ltWm1NREE2TURveE16QWlPbnNpYTJWNVgzUjVjR1VpT2lKdlptWnNhVzVsSWl3aWEyVjVYM1psY25OcGIyNGlPakY5ZlN3aWNISnZiMlpmYjJaZmNHOXpjMlZ6YzJsdmJpSTZlMzE5","signatures":[{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRJd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"SdH+eYVBEkoUxFBVgcWgyUqx5lhjIT6odBc+TNpXyGjX6LbrVMGt0v6NXPEAhncSOmc4ZkeijWZ3yGgYkpUMCg=="},{"protected":"ZXlKaGJHY2lPaUpsWkRJMU5URTVJaXdpZEhsd1pTSTZJblp2ZEdVaUxDSnJaWGxmZEhsd1pTSTZJbTltWm14cGJtVWlMQ0pyWlhsZmRtVnljMmx2YmlJNk1Td2lZWE1pT2lKbVpqQXdPakE2TVRNd0lpd2lZM0pwZENJNld5SjBlWEJsSWl3aWEyVjVYM1I1Y0dVaUxDSnJaWGxmZG1WeWMybHZiaUlzSW1GeklsMTk=","signature":"ruX0+fCYTugNPxGr6qLTCuEidS8tJ5nVlREba5T8jrfReOGLTlHoWjoxrHYredg/UpTcAghANROVfEaBa0mhCg=="}]}
+{"payload":"eyJpc2QiOjEsInRyY192ZXJzaW9uIjozLCJiYXNlX3ZlcnNpb24iOjEsImRlc2NyaXB0aW9uIjoiSVNEIDEiLCJ2b3RpbmdfcXVvcnVtIjoxLCJmb3JtYXRfdmVyc2lvbiI6MSwiZ3JhY2VfcGVyaW9kIjo3MjAwLCJ0cnVzdF9yZXNldF9hbGxvd2VkIjp0cnVlLCJ2YWxpZGl0eSI6eyJub3RfYmVmb3JlIjoxNTczMDMzOTY5LCJub3RfYWZ0ZXIiOjE2MDQ1Njk5Njl9LCJwcmltYXJ5X2FzZXMiOnsiZmYwMDowOjExMCI6eyJhdHRyaWJ1dGVzIjpbImlzc3VpbmciLCJ2b3RpbmciXSwia2V5cyI6eyJpc3N1aW5nIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoiay9uSkFXOTV3eTVFa1dkem1HaEVGU0xnSEJJNnVBdnJDR0k5V013UUQ0MD0ifSwib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVCR0tRU3B3Vm5SNm01NXlnRzhKMVYzUXppMmN2dlhyUkpHdkxwc2ZNQ009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MiwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlJXb3VuQjF5V2UyRmRRWVFHVDVqS09XU1ovUEZ1WlhEQ055dWdJNmUyZTg9In19fSwiZmYwMDowOjEyMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwidm90aW5nIl0sImtleXMiOnsib2ZmbGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6IlVPb0tkUkkvbkJESHlINHdzbjh2azFMSnFzN1dpY2ozbklidi9Ta2JIL009In0sIm9ubGluZSI6eyJrZXlfdmVyc2lvbiI6MSwiYWxnb3JpdGhtIjoiZWQyNTUxOSIsImtleSI6InVEa3JNYnN2Y2M0cGtDdFgrbWJBRlg1UzMxS0t4Z1FZZWp6WHBuYmxBYUU9In19fSwiZmYwMDowOjEzMCI6eyJhdHRyaWJ1dGVzIjpbImF1dGhvcml0YXRpdmUiLCJjb3JlIiwiaXNzdWluZyIsInZvdGluZyJdLCJrZXlzIjp7Imlzc3VpbmciOnsia2V5X3ZlcnNpb24iOjEsImFsZ29yaXRobSI6ImVkMjU1MTkiLCJrZXkiOiJsZ3pCamxVQXEvN1A5UlB2dE5lQTRzMjc4N1UyMG91M1JsMFZudlY2UXFzPSJ9LCJvZmZsaW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoianp1c1pyWWNYMU9FTXM5U2lVbTBRTDBGL2diZW5PaHR2MzFBSUt0ZjB2VT0ifSwib25saW5lIjp7ImtleV92ZXJzaW9uIjoxLCJhbGdvcml0aG0iOiJlZDI1NTE5Iiwia2V5Ijoia0NwYkNxelpLNGxaZGVLZzdHMDNOZ09KeXdjMFJGcngyNDhCVkFGZ3hjYz0ifX19fSwidm90ZXMiOnsiZmYwMDowOjEyMCI6eyJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MX0sImZmMDA6MDoxMzAiOnsia2V5X3R5cGUiOiJvZmZsaW5lIiwia2V5X3ZlcnNpb24iOjF9fSwicHJvb2Zfb2ZfcG9zc2Vzc2lvbiI6e319","signatures":[{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTIwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"SdH-eYVBEkoUxFBVgcWgyUqx5lhjIT6odBc-TNpXyGjX6LbrVMGt0v6NXPEAhncSOmc4ZkeijWZ3yGgYkpUMCg"},{"protected":"eyJhbGciOiJlZDI1NTE5IiwidHlwZSI6InZvdGUiLCJrZXlfdHlwZSI6Im9mZmxpbmUiLCJrZXlfdmVyc2lvbiI6MSwiYXMiOiJmZjAwOjA6MTMwIiwiY3JpdCI6WyJ0eXBlIiwia2V5X3R5cGUiLCJrZXlfdmVyc2lvbiIsImFzIl19","signature":"ruX0-fCYTugNPxGr6qLTCuEidS8tJ5nVlREba5T8jrfReOGLTlHoWjoxrHYredg_UpTcAghANROVfEaBa0mhCg"}]}