Skip to content
This repository was archived by the owner on Sep 23, 2025. It is now read-only.

Commit 96032dd

Browse files
codysoylandcodysoyland
committed
Update test data and generator
- Update test data generator to accomodate for upstream TUF changes - Fix issue with timestamp serialization that was breaking some tests - Regenerate test data due to expired TUF root metadata Signed-off-by: Cody Soyland <[email protected]>
1 parent 3645dd2 commit 96032dd

15 files changed

+99
-100
lines changed

‎hack/gentestdata/gentestdata.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
"github.com/sigstore/scaffolding/pkg/repo"
3939
"github.com/sigstore/sigstore/pkg/cryptoutils"
4040
"google.golang.org/protobuf/encoding/protojson"
41+
"google.golang.org/protobuf/types/known/timestamppb"
4142
)
4243

4344
// This program generates test data for the trustroot reconciler.
@@ -237,7 +238,7 @@ func genLogID(pkBytes []byte) (string, error) {
237238
func genTUFRepo(files map[string][]byte) ([]byte, []byte, error) {
238239
defer os.RemoveAll(path.Join(os.TempDir(), "tuf")) // TODO: Update scaffolding to use os.MkdirTemp and remove this
239240
ctx := context.Background()
240-
local, dir, err := repo.CreateRepo(ctx, files)
241+
local, dir, err := repo.CreateRepoWithOptions(ctx, files, repo.CreateRepoOptions{AddMetadataTargets: true})
241242
if err != nil {
242243
return nil, nil, err
243244
}
@@ -274,9 +275,7 @@ func genTrustedRoot(sigstoreKeysMap map[string]string) ([]byte, error) {
274275
trustRoot := &config.SigstoreKeys{
275276
CertificateAuthorities: []*config.CertificateAuthority{{
276277
CertChain: certChain,
277-
ValidFor: &config.TimeRange{
278-
Start: &config.Timestamp{},
279-
},
278+
ValidFor: &config.TimeRange{Start: &timestamppb.Timestamp{}},
280279
}},
281280
Tlogs: []*config.TransparencyLogInstance{{
282281
HashAlgorithm: pbcommon.HashAlgorithm_SHA2_256,

‎pkg/reconciler/trustroot/testdata/ctfeLogID.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
df8dc4f435a63e8cd48d2557c3c228e9558e04dca899fab5612a6d60d515e8f0
1+
ce0e092b9e35b0b9e3637a96a27b8eb3806e7f366e70367eddcbb65b4f0b7165

‎pkg/reconciler/trustroot/testdata/ctfePublicKey.pem‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-----BEGIN PUBLIC KEY-----
2-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEklvaOetNsPoZt+BHsE0bbHybxHsk
3-
ImD/Swu8QyDZONn2hnJNxEImaz6Xzv7+/bzns9y0/b9NadWbeDht3KGBBg==
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lA
3+
a+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==
44
-----END PUBLIC KEY-----

‎pkg/reconciler/trustroot/testdata/fulcioCertChain.pem‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-----BEGIN CERTIFICATE-----
2-
MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0
3-
MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDzENMAsGA1UEAxMEbGVhZjBZMBMG
4-
ByqGSM49AgEGCCqGSM49AwEHA0IABAJCeHCU8sFwES7vmf4dAABk7HC2hclCwgAM
5-
CwPbdJAXRyA9wWFQhWM8osvic/LMq5m0AfVi4y1hjhFkrLjfbHejMzAxMA4GA1Ud
6-
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBRQn62BEmrPPx7tr1ZIcgrTbMrj8DAKBggq
7-
hkjOPQQDAgNHADBEAiAS77lBrjWbbYKGBJ/i5ag/Rmsml+oECQ/GMmxdEZ/MzAIg
8-
cjfmUGYXufT/lX2VXsvkFzfVQH1fG0g5i03NWSFYDB4=
2+
MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
3+
MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMG
4+
ByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp
5+
27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1Ud
6+
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggq
7+
hkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YC
8+
IBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa
99
-----END CERTIFICATE-----
1010
-----BEGIN CERTIFICATE-----
11-
MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0
12-
MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDTELMAkGA1UEAxMCY2EwWTATBgcq
13-
hkjOPQIBBggqhkjOPQMBBwNCAAR3h5jys9TUi2KTcvbxjCpkC+qoHcVikiWRdkp1
14-
WAMg1fJAQvqPX8kB8OSXc2v8pTBKmzMteEvZJW+9kkybobtKo0IwQDAOBgNVHQ8B
15-
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUUJ+tgRJqzz8e7a9W
16-
SHIK02zK4/AwCgYIKoZIzj0EAwIDSAAwRQIgUVBM1Lkvf7DVjG6hygMVTK2cWkHD
17-
djL4MW8wCFaKV9YCIQC2DtPtWvu/VgaI0QGI+v7iGNnPf7USY0qlJwWWGvAaWw==
11+
MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
12+
MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcq
13+
hkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+
14+
dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8B
15+
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQ
16+
ltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHq
17+
pBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU=
1818
-----END CERTIFICATE-----

‎pkg/reconciler/trustroot/testdata/marshalledEntry.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
"baseUrl": "https://rekor.example.com",
66
"hashAlgorithm": "SHA2_256",
77
"publicKey": {
8-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoM/qB3YtDs6+rXvxfxZNXH0dfXY85qgGuiJJezpzXjCm6jbiUp15VpzNcdJGzExHNZYZj7l+ma1Fjer68+1+tA==",
8+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yTmXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==",
99
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
1010
"validFor": {
1111
"start": "1970-01-01T00:00:00Z"
1212
}
1313
},
1414
"logId": {
15-
"keyId": "Yzk5MjkxODU0M2MxNmIwZGY2Y2NkMGQ4ODE2NjVkNDljZGQxZWYzZjM4M2IxNmY5YzRkNjRiODhjZWRmZTAxMA=="
15+
"keyId": "ZmFiYWE1Nzg1MjczODczMWU1YmEwYjUyNzAzYWVkMWU4MzE0Yjk3ZTk1MDBiMDk5NDI5NjQwYWQ2NWRlMWM3MA=="
1616
}
1717
}
1818
],
@@ -26,10 +26,10 @@
2626
"certChain": {
2727
"certificates": [
2828
{
29-
"rawBytes": "MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAJCeHCU8sFwES7vmf4dAABk7HC2hclCwgAMCwPbdJAXRyA9wWFQhWM8osvic/LMq5m0AfVi4y1hjhFkrLjfbHejMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBRQn62BEmrPPx7tr1ZIcgrTbMrj8DAKBggqhkjOPQQDAgNHADBEAiAS77lBrjWbbYKGBJ/i5ag/Rmsml+oECQ/GMmxdEZ/MzAIgcjfmUGYXufT/lX2VXsvkFzfVQH1fG0g5i03NWSFYDB4="
29+
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggqhkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YCIBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa"
3030
},
3131
{
32-
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3h5jys9TUi2KTcvbxjCpkC+qoHcVikiWRdkp1WAMg1fJAQvqPX8kB8OSXc2v8pTBKmzMteEvZJW+9kkybobtKo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUUJ+tgRJqzz8e7a9WSHIK02zK4/AwCgYIKoZIzj0EAwIDSAAwRQIgUVBM1Lkvf7DVjG6hygMVTK2cWkHDdjL4MW8wCFaKV9YCIQC2DtPtWvu/VgaI0QGI+v7iGNnPf7USY0qlJwWWGvAaWw=="
32+
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHqpBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU="
3333
}
3434
]
3535
},
@@ -43,14 +43,14 @@
4343
"baseUrl": "https://ctfe.example.com",
4444
"hashAlgorithm": "SHA2_256",
4545
"publicKey": {
46-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEklvaOetNsPoZt+BHsE0bbHybxHskImD/Swu8QyDZONn2hnJNxEImaz6Xzv7+/bzns9y0/b9NadWbeDht3KGBBg==",
46+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lAa+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==",
4747
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
4848
"validFor": {
4949
"start": "1970-01-01T00:00:00Z"
5050
}
5151
},
5252
"logId": {
53-
"keyId": "ZGY4ZGM0ZjQzNWE2M2U4Y2Q0OGQyNTU3YzNjMjI4ZTk1NThlMDRkY2E4OTlmYWI1NjEyYTZkNjBkNTE1ZThmMA=="
53+
"keyId": "Y2UwZTA5MmI5ZTM1YjBiOWUzNjM3YTk2YTI3YjhlYjM4MDZlN2YzNjZlNzAzNjdlZGRjYmI2NWI0ZjBiNzE2NQ=="
5454
}
5555
}
5656
],
@@ -64,10 +64,10 @@
6464
"certChain": {
6565
"certificates": [
6666
{
67-
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABFRMP78f6+Bm7cYAIcANQphYMj0YJHD620uGHPNck0Ei1IKqDCRPCGQDAHprk3y/sBIcLPZU8Hxig5xV0w28qAKjMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBRB+eA8vn2NROBb/iTfLHyr/c1BmDAKBggqhkjOPQQDAgNIADBFAiEA7r8SEfLto3dQDZIqf/0qQy5+q8hiRNbZ3R4JPxPJtugCIFfiAfFrpzUYp6XuJSuOHfgFP2378zn2jl9kUoQYCjNs"
67+
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCKH3XivQjrlRMPBECYj4/aM4HxhmsDjB42Zb5lQNzNLybRCxhequ9/cQUgiAAlqyVNyr2Q38R15ZlzSOJ1IHNyjMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBQVwh0Oz6XDozbQWCf7Pozi1nmPZDAKBggqhkjOPQQDAgNJADBGAiEA5o/l9vC7gg2N+QZ+8JKPKmbJtvVuiEEdeZu6zOrJ94sCIQCB5pj2/dyIOwpdtK+CKWvKzY7PzyLc3OuC3GgPmDLHOg=="
6868
},
6969
{
70-
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASrdvjuuS7ZO/piTX2pxT56yBKhwq+SHeXt8MsaNYPBG84m5G/3m3uLB5YxCRq4o6vhKM0HEU4UcQ3LdKL92Axao0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUQfngPL59jUTgW/4k3yx8q/3NQZgwCgYIKoZIzj0EAwIDSAAwRQIgXeSyRZXqJZPSba7S56k9fce1xLppSN4m9MtfTw7MdpoCIQD3L40eRQUu2YV+74MWm1nGbma5IVfp9tgZxaAw80brWg=="
70+
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATKKGhibPWiUGgf5xOEgR4+mp2CEi4V0J12yjJzP8FJI67idgmGmdH/74hteKO+ooxvjG4obZJtwcpPztshjzaro0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUFcIdDs+lw6M20Fgn+z6M4tZ5j2QwCgYIKoZIzj0EAwIDSQAwRgIhAOATau0ajIlhNT1JWFbKO7G2g5iCH3Rsw8nU3UqQH9L4AiEA3HiFPlIFmKRvYJmyGECLw8EO2gRamBpFoi6pszfO58w="
7171
}
7272
]
7373
},

‎pkg/reconciler/trustroot/testdata/marshalledEntryFromMirrorFS.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
{
44
"hashAlgorithm": "SHA2_256",
55
"publicKey": {
6-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoM/qB3YtDs6+rXvxfxZNXH0dfXY85qgGuiJJezpzXjCm6jbiUp15VpzNcdJGzExHNZYZj7l+ma1Fjer68+1+tA==",
6+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yTmXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==",
77
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
88
"validFor": {
99
"start": "1970-01-01T00:00:00Z"
1010
}
1111
},
1212
"logId": {
13-
"keyId": "Yzk5MjkxODU0M2MxNmIwZGY2Y2NkMGQ4ODE2NjVkNDljZGQxZWYzZjM4M2IxNmY5YzRkNjRiODhjZWRmZTAxMA=="
13+
"keyId": "ZmFiYWE1Nzg1MjczODczMWU1YmEwYjUyNzAzYWVkMWU4MzE0Yjk3ZTk1MDBiMDk5NDI5NjQwYWQ2NWRlMWM3MA=="
1414
}
1515
}
1616
],
@@ -19,10 +19,10 @@
1919
"certChain": {
2020
"certificates": [
2121
{
22-
"rawBytes": "MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAJCeHCU8sFwES7vmf4dAABk7HC2hclCwgAMCwPbdJAXRyA9wWFQhWM8osvic/LMq5m0AfVi4y1hjhFkrLjfbHejMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBRQn62BEmrPPx7tr1ZIcgrTbMrj8DAKBggqhkjOPQQDAgNHADBEAiAS77lBrjWbbYKGBJ/i5ag/Rmsml+oECQ/GMmxdEZ/MzAIgcjfmUGYXufT/lX2VXsvkFzfVQH1fG0g5i03NWSFYDB4="
22+
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggqhkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YCIBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa"
2323
},
2424
{
25-
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI0MDgzMDE4NTczOFoXDTM0MDgzMDE4NTczOFowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3h5jys9TUi2KTcvbxjCpkC+qoHcVikiWRdkp1WAMg1fJAQvqPX8kB8OSXc2v8pTBKmzMteEvZJW+9kkybobtKo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUUJ+tgRJqzz8e7a9WSHIK02zK4/AwCgYIKoZIzj0EAwIDSAAwRQIgUVBM1Lkvf7DVjG6hygMVTK2cWkHDdjL4MW8wCFaKV9YCIQC2DtPtWvu/VgaI0QGI+v7iGNnPf7USY0qlJwWWGvAaWw=="
25+
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHqpBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU="
2626
}
2727
]
2828
},
@@ -35,14 +35,14 @@
3535
{
3636
"hashAlgorithm": "SHA2_256",
3737
"publicKey": {
38-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEklvaOetNsPoZt+BHsE0bbHybxHskImD/Swu8QyDZONn2hnJNxEImaz6Xzv7+/bzns9y0/b9NadWbeDht3KGBBg==",
38+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lAa+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==",
3939
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
4040
"validFor": {
4141
"start": "1970-01-01T00:00:00Z"
4242
}
4343
},
4444
"logId": {
45-
"keyId": "ZGY4ZGM0ZjQzNWE2M2U4Y2Q0OGQyNTU3YzNjMjI4ZTk1NThlMDRkY2E4OTlmYWI1NjEyYTZkNjBkNTE1ZThmMA=="
45+
"keyId": "Y2UwZTA5MmI5ZTM1YjBiOWUzNjM3YTk2YTI3YjhlYjM4MDZlN2YzNjZlNzAzNjdlZGRjYmI2NWI0ZjBiNzE2NQ=="
4646
}
4747
}
4848
]

‎pkg/reconciler/trustroot/testdata/rekorLogID.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c992918543c16b0df6ccd0d881665d49cdd1ef3f383b16f9c4d64b88cedfe010
1+
fabaa57852738731e5ba0b52703aed1e8314b97e9500b099429640ad65de1c70

‎pkg/reconciler/trustroot/testdata/rekorPublicKey.pem‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-----BEGIN PUBLIC KEY-----
2-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoM/qB3YtDs6+rXvxfxZNXH0dfXY8
3-
5qgGuiJJezpzXjCm6jbiUp15VpzNcdJGzExHNZYZj7l+ma1Fjer68+1+tA==
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yT
3+
mXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==
44
-----END PUBLIC KEY-----

‎pkg/reconciler/trustroot/testdata/root.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,85 +3,85 @@
33
"_type": "root",
44
"spec_version": "1.0",
55
"version": 1,
6-
"expires": "2025-03-02T14:57:39-05:00",
6+
"expires": "2025-10-02T16:41:39-04:00",
77
"keys": {
8-
"4f582b75693f91cad069ae575ffd9903f520f646a74ba85513b8a0f130f7da83": {
8+
"4b6e470a6ae80de875a55e14ebb6f237d849afb159b9702d52a0e83a094eb79e": {
99
"keytype": "ed25519",
1010
"scheme": "ed25519",
1111
"keyid_hash_algorithms": [
1212
"sha256",
1313
"sha512"
1414
],
1515
"keyval": {
16-
"public": "23237e06e0576311c798074b04b4b02ba305fd21675c8d3a1090943693de6083"
16+
"public": "c15703fe858491eb71333222bd1d3ae9a1b12a2ad6da855a0bb87cc62bdcb1db"
1717
}
1818
},
19-
"5aa0cc3e4d630d733e5b9c7be589357164ee676fe5b300b7a328008be25c667a": {
19+
"5bba1132b50cab237959cf28b8471e22b448f618078934e4a551b42956cc2aeb": {
2020
"keytype": "ed25519",
2121
"scheme": "ed25519",
2222
"keyid_hash_algorithms": [
2323
"sha256",
2424
"sha512"
2525
],
2626
"keyval": {
27-
"public": "eee8a9d75bbe2b7caaaea199cac99fc21eee9d54929bb5454e2113e5a9bd6d87"
27+
"public": "cabab661f4fbe2a5149f46d1749d4d31275ef3c253c42ab43c23a7defd83e9e2"
2828
}
2929
},
30-
"83418a374fa1334254d6b11f6ae0b8d0f98a078d45a1d8d3294b20c35868bf11": {
30+
"5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971": {
3131
"keytype": "ed25519",
3232
"scheme": "ed25519",
3333
"keyid_hash_algorithms": [
3434
"sha256",
3535
"sha512"
3636
],
3737
"keyval": {
38-
"public": "f33d2aae405e597113e473568d0120e850952c184fb4b2a631f93be2bb8b8824"
38+
"public": "2153df976dd0916189119c20c833d3feea9b8f03e638c30ea86138106ba195f1"
3939
}
4040
},
41-
"a93ec7e1ab7f6f3c29b5723613e450905ef00e9640abd46a42c771bd860a4202": {
41+
"86ea80bbb0d782cc9ad0cb509cdcee05cccb70b22287d1506660f0c4882d899b": {
4242
"keytype": "ed25519",
4343
"scheme": "ed25519",
4444
"keyid_hash_algorithms": [
4545
"sha256",
4646
"sha512"
4747
],
4848
"keyval": {
49-
"public": "64dca5d45b16d535154d17817061bc121534175da74ec9f2984ccbbc6dad9cd7"
49+
"public": "d56d7d86bdc349455a9353b850b5c5482178cfd427db91a26fd76379ee422ac6"
5050
}
5151
}
5252
},
5353
"roles": {
5454
"root": {
5555
"keyids": [
56-
"83418a374fa1334254d6b11f6ae0b8d0f98a078d45a1d8d3294b20c35868bf11"
56+
"5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971"
5757
],
5858
"threshold": 1
5959
},
6060
"snapshot": {
6161
"keyids": [
62-
"5aa0cc3e4d630d733e5b9c7be589357164ee676fe5b300b7a328008be25c667a"
62+
"5bba1132b50cab237959cf28b8471e22b448f618078934e4a551b42956cc2aeb"
6363
],
6464
"threshold": 1
6565
},
6666
"targets": {
6767
"keyids": [
68-
"4f582b75693f91cad069ae575ffd9903f520f646a74ba85513b8a0f130f7da83"
68+
"86ea80bbb0d782cc9ad0cb509cdcee05cccb70b22287d1506660f0c4882d899b"
6969
],
7070
"threshold": 1
7171
},
7272
"timestamp": {
7373
"keyids": [
74-
"a93ec7e1ab7f6f3c29b5723613e450905ef00e9640abd46a42c771bd860a4202"
74+
"4b6e470a6ae80de875a55e14ebb6f237d849afb159b9702d52a0e83a094eb79e"
7575
],
7676
"threshold": 1
7777
}
7878
},
79-
"consistent_snapshot": false
79+
"consistent_snapshot": true
8080
},
8181
"signatures": [
8282
{
83-
"keyid": "83418a374fa1334254d6b11f6ae0b8d0f98a078d45a1d8d3294b20c35868bf11",
84-
"sig": "a9806043d6f4d74b9e768bbc136d8d0a498c5d5143b5d921bcc0cd8d9a8c4ab4c8fba5b908303e316d373555fd0a252436806aad85437140acd93cf1ef2d910d"
83+
"keyid": "5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971",
84+
"sig": "491a3f69cc2aa878e0caa1b8f5488f69c1c0ebac08b2a655110454c21fe166245554eaf5d9c3b83a01a5fff9eb4c2b70cfb8af53b576193a746d404ea30a920e"
8585
}
8686
]
8787
}

0 commit comments

Comments
 (0)