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

Commit 5f9edcc

Browse files
author
jkylekelly
committed
Merge branch 'pr-1857' into jkylekelly/update-tests
2 parents c7514c9 + 2caf515 commit 5f9edcc

16 files changed

+112
-97
lines changed

‎pkg/apis/policy/v1alpha1/trustroot_validation_test.go‎

Lines changed: 10 additions & 2 deletions
Large diffs are not rendered by default.

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

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

‎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-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lA
3-
a+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/LRj+kZcPIO3VWlCeulO6WFtd1Vk
3+
oG80NXchsgpBYD14tH7daOdYukeLzS+BqQFBafrHJy3dzQUNTiHwpiySMA==
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-
MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
3-
MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMG
4-
ByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp
5-
27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1Ud
6-
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggq
7-
hkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YC
8-
IBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa
2+
MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
3+
MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDzENMAsGA1UEAxMEbGVhZjBZMBMG
4+
ByqGSM49AgEGCCqGSM49AwEHA0IABCRENSlBsT9Cceu6g60k/y/vzRPM6hb8BJbq
5+
sX/xx4PpbXO3Um0h+CN/p6WAJh/4koXLVHaRTokl+kNc/OMhp9WjMzAxMA4GA1Ud
6+
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBTMEbK6/VqSJCNSppR2WoB7izlXsDAKBggq
7+
hkjOPQQDAgNHADBEAiBXRhIwRdnUy5aniaeIFqsnaOjYddGuhc1u//6ReUzfwgIg
8+
eHDfF6BK7OmnUvc62QOJeSWj7CRe+wJd9rTL9FeDjCU=
99
-----END CERTIFICATE-----
1010
-----BEGIN CERTIFICATE-----
11-
MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
12-
MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcq
13-
hkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+
14-
dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8B
15-
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQ
16-
ltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHq
17-
pBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU=
11+
MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1
12+
MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDTELMAkGA1UEAxMCY2EwWTATBgcq
13+
hkjOPQIBBggqhkjOPQMBBwNCAAS9qmFBSdQ8sgNy0yRybzJMKmhC9pO4TQRt2dPv
14+
6SDJTNjOTQLm9CtBQhDOmNaanTzEUFCZxA/3Gx5a+JP0/Ts5o0IwQDAOBgNVHQ8B
15+
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUzBGyuv1akiQjUqaU
16+
dlqAe4s5V7AwCgYIKoZIzj0EAwIDSAAwRQIhAMPb6kbHcMhpWzc7nb8QRadvUxfd
17+
UnF2pGamtoZ4+LCXAiA4zDqYSz8JLPHgpAtXF3i/2PyqXGKy9eSlprIAYgZ7jg==
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": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yTmXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==",
8+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfISMcpAiZrwd7KUThb0fgrsFOM1MJOxgH4OD+md+c0yHEZ6UsOR5UF5HAN/qD5skTTcXJuSOogZVc/xeOvhSTw==",
99
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
1010
"validFor": {
1111
"start": "1970-01-01T00:00:00Z"
1212
}
1313
},
1414
"logId": {
15-
"keyId": "ZmFiYWE1Nzg1MjczODczMWU1YmEwYjUyNzAzYWVkMWU4MzE0Yjk3ZTk1MDBiMDk5NDI5NjQwYWQ2NWRlMWM3MA=="
15+
"keyId": "YmRmY2I5OTA3NmVjODg5MTMyNDFjYjk4ZTcyMTc4NTljNTRhYThiYTdmNjMzMTQyM2FiOWI3N2Q1ZjQxNGU5OA=="
1616
}
1717
}
1818
],
@@ -26,10 +26,10 @@
2626
"certChain": {
2727
"certificates": [
2828
{
29-
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggqhkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YCIBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa"
29+
"rawBytes": "MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCRENSlBsT9Cceu6g60k/y/vzRPM6hb8BJbqsX/xx4PpbXO3Um0h+CN/p6WAJh/4koXLVHaRTokl+kNc/OMhp9WjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBTMEbK6/VqSJCNSppR2WoB7izlXsDAKBggqhkjOPQQDAgNHADBEAiBXRhIwRdnUy5aniaeIFqsnaOjYddGuhc1u//6ReUzfwgIgeHDfF6BK7OmnUvc62QOJeSWj7CRe+wJd9rTL9FeDjCU="
3030
},
3131
{
32-
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHqpBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU="
32+
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9qmFBSdQ8sgNy0yRybzJMKmhC9pO4TQRt2dPv6SDJTNjOTQLm9CtBQhDOmNaanTzEUFCZxA/3Gx5a+JP0/Ts5o0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUzBGyuv1akiQjUqaUdlqAe4s5V7AwCgYIKoZIzj0EAwIDSAAwRQIhAMPb6kbHcMhpWzc7nb8QRadvUxfdUnF2pGamtoZ4+LCXAiA4zDqYSz8JLPHgpAtXF3i/2PyqXGKy9eSlprIAYgZ7jg=="
3333
}
3434
]
3535
},
@@ -43,14 +43,14 @@
4343
"baseUrl": "https://ctfe.example.com",
4444
"hashAlgorithm": "SHA2_256",
4545
"publicKey": {
46-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lAa+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==",
46+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/LRj+kZcPIO3VWlCeulO6WFtd1VkoG80NXchsgpBYD14tH7daOdYukeLzS+BqQFBafrHJy3dzQUNTiHwpiySMA==",
4747
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
4848
"validFor": {
4949
"start": "1970-01-01T00:00:00Z"
5050
}
5151
},
5252
"logId": {
53-
"keyId": "Y2UwZTA5MmI5ZTM1YjBiOWUzNjM3YTk2YTI3YjhlYjM4MDZlN2YzNjZlNzAzNjdlZGRjYmI2NWI0ZjBiNzE2NQ=="
53+
"keyId": "NzJkNmRhZTkyYjI3ZTNjNjZjZTdjMDYxMTg3ODJhODdkNjRjYjFjYTRkNThkYTdiZTRiZjZhNmM4MTYzN2Q5NA=="
5454
}
5555
}
5656
],
@@ -64,10 +64,10 @@
6464
"certChain": {
6565
"certificates": [
6666
{
67-
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCKH3XivQjrlRMPBECYj4/aM4HxhmsDjB42Zb5lQNzNLybRCxhequ9/cQUgiAAlqyVNyr2Q38R15ZlzSOJ1IHNyjMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBQVwh0Oz6XDozbQWCf7Pozi1nmPZDAKBggqhkjOPQQDAgNJADBGAiEA5o/l9vC7gg2N+QZ+8JKPKmbJtvVuiEEdeZu6zOrJ94sCIQCB5pj2/dyIOwpdtK+CKWvKzY7PzyLc3OuC3GgPmDLHOg=="
67+
"rawBytes": "MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABI6Y+7lytAlUaqJMhBNX8MacXsvm80DnYy9rr1VD1vGaeILTzGO7lweQbR+tWPttctXOTeMq7OPfxjs0alKj+eWjMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBS7jGT6QsK8sOLUKDLBCiQpI4AsCzAKBggqhkjOPQQDAgNHADBEAiBnLHjW1+zfJDNshoofVq3brzx4Vn81HQc4k9GcUffTMgIgBCyyGkJ+ayLAPmMUkX7nVZa1RB84rzHV57PISF04bq4="
6868
},
6969
{
70-
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATKKGhibPWiUGgf5xOEgR4+mp2CEi4V0J12yjJzP8FJI67idgmGmdH/74hteKO+ooxvjG4obZJtwcpPztshjzaro0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUFcIdDs+lw6M20Fgn+z6M4tZ5j2QwCgYIKoZIzj0EAwIDSQAwRgIhAOATau0ajIlhNT1JWFbKO7G2g5iCH3Rsw8nU3UqQH9L4AiEA3HiFPlIFmKRvYJmyGECLw8EO2gRamBpFoi6pszfO58w="
70+
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+D/5XUFXokHysm5PZVgiR0Ef/iCy3hQjbGEoZiDLKsrmGJB+LN4nA5opRL1vVvIwHRCIhu0zymmm6HufsoVXqo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu4xk+kLCvLDi1CgywQokKSOALAswCgYIKoZIzj0EAwIDSQAwRgIhAP6oXEyOIqTjIrgzrtnsVGo5/CIkVwpNy4Kumxev0L2gAiEAncABJkWROim1c7QJl3uYvKbkZkOL3frGVEPc1vxNIms="
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": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yTmXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==",
6+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfISMcpAiZrwd7KUThb0fgrsFOM1MJOxgH4OD+md+c0yHEZ6UsOR5UF5HAN/qD5skTTcXJuSOogZVc/xeOvhSTw==",
77
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
88
"validFor": {
99
"start": "1970-01-01T00:00:00Z"
1010
}
1111
},
1212
"logId": {
13-
"keyId": "ZmFiYWE1Nzg1MjczODczMWU1YmEwYjUyNzAzYWVkMWU4MzE0Yjk3ZTk1MDBiMDk5NDI5NjQwYWQ2NWRlMWM3MA=="
13+
"keyId": "YmRmY2I5OTA3NmVjODg5MTMyNDFjYjk4ZTcyMTc4NTljNTRhYThiYTdmNjMzMTQyM2FiOWI3N2Q1ZjQxNGU5OA=="
1414
}
1515
}
1616
],
@@ -19,10 +19,10 @@
1919
"certChain": {
2020
"certificates": [
2121
{
22-
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDinvflTjDOr/6o70lfMWBRtYnaJcYIIdGJp27wvISz6CbXoz4wuZbYi3oOlw6uDed+QpMQfJaGcgH0GQ9nM6vyjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBQnBOo/FKFK5QsnmtCW3EULNg7a8jAKBggqhkjOPQQDAgNIADBFAiEAobePrizti+1TidezZrdZbPczorA3eNJXO11khRT5f6YCIBGX6djF1e44voTyfjajRH6JeyWdRv7OkLKFqk94nxYa"
22+
"rawBytes": "MIIBPDCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCRENSlBsT9Cceu6g60k/y/vzRPM6hb8BJbqsX/xx4PpbXO3Um0h+CN/p6WAJh/4koXLVHaRTokl+kNc/OMhp9WjMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBTMEbK6/VqSJCNSppR2WoB7izlXsDAKBggqhkjOPQQDAgNHADBEAiBXRhIwRdnUy5aniaeIFqsnaOjYddGuhc1u//6ReUzfwgIgeHDfF6BK7OmnUvc62QOJeSWj7CRe+wJd9rTL9FeDjCU="
2323
},
2424
{
25-
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDQwMjIwNDEzOVoXDTM1MDQwMjIwNDEzOVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATYMFeaxWdAnFM3nGB7MT4cVWHwWLpHtGeCWtU+dGLqBlF7mM/QjdGmZ3Ea3sb8k1PZfm3m2ycJtu1mle6llLjHo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUJwTqPxShSuULJ5rQltxFCzYO2vIwCgYIKoZIzj0EAwIDSQAwRgIhAIQQCaaKqofWp/rNU3qyVN6qGYHqpBMR5UHKY2ms6UaHAiEAxQ0YHuxXHYziMHoO5Ey8gIbnTSfpCUSltKKhZ5ppgrU="
25+
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI1MDcwMTExMjEwM1oXDTM1MDcwMTExMjEwM1owDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS9qmFBSdQ8sgNy0yRybzJMKmhC9pO4TQRt2dPv6SDJTNjOTQLm9CtBQhDOmNaanTzEUFCZxA/3Gx5a+JP0/Ts5o0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUzBGyuv1akiQjUqaUdlqAe4s5V7AwCgYIKoZIzj0EAwIDSAAwRQIhAMPb6kbHcMhpWzc7nb8QRadvUxfdUnF2pGamtoZ4+LCXAiA4zDqYSz8JLPHgpAtXF3i/2PyqXGKy9eSlprIAYgZ7jg=="
2626
}
2727
]
2828
},
@@ -35,14 +35,14 @@
3535
{
3636
"hashAlgorithm": "SHA2_256",
3737
"publicKey": {
38-
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdQpbV0RszJ9g2DUmv1RAYXUWS+lAa+YbNaU6Q9ZbXmATIX+C+4nUbgM6u0ooW9eXxtnUVAwDGVuHGWtr5VzyLg==",
38+
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/LRj+kZcPIO3VWlCeulO6WFtd1VkoG80NXchsgpBYD14tH7daOdYukeLzS+BqQFBafrHJy3dzQUNTiHwpiySMA==",
3939
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
4040
"validFor": {
4141
"start": "1970-01-01T00:00:00Z"
4242
}
4343
},
4444
"logId": {
45-
"keyId": "Y2UwZTA5MmI5ZTM1YjBiOWUzNjM3YTk2YTI3YjhlYjM4MDZlN2YzNjZlNzAzNjdlZGRjYmI2NWI0ZjBiNzE2NQ=="
45+
"keyId": "NzJkNmRhZTkyYjI3ZTNjNjZjZTdjMDYxMTg3ODJhODdkNjRjYjFjYTRkNThkYTdiZTRiZjZhNmM4MTYzN2Q5NA=="
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-
fabaa57852738731e5ba0b52703aed1e8314b97e9500b099429640ad65de1c70
1+
bdfcb99076ec88913241cb98e7217859c54aa8ba7f6331423ab9b77d5f414e98

‎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-
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE8OnaXgP7Oj//llRdP76GRDNIx8yT
3-
mXm8tra6qck1nt3ZmNvbTcKQu2WXL3kpBNYK3wMg9I3BfeWA36OlUQYL0Q==
2+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfISMcpAiZrwd7KUThb0fgrsFOM1M
3+
JOxgH4OD+md+c0yHEZ6UsOR5UF5HAN/qD5skTTcXJuSOogZVc/xeOvhSTw==
44
-----END PUBLIC KEY-----

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,75 @@
33
"_type": "root",
44
"spec_version": "1.0",
55
"version": 1,
6-
"expires": "2025-10-02T16:41:39-04:00",
6+
"expires": "2026-01-01T13:21:04+01:00",
77
"keys": {
8-
"4b6e470a6ae80de875a55e14ebb6f237d849afb159b9702d52a0e83a094eb79e": {
8+
"0d940e166ae0568ea03cc478aa85b1665f7f92a35d7999575e31b21e408f487d": {
99
"keytype": "ed25519",
1010
"scheme": "ed25519",
1111
"keyid_hash_algorithms": [
1212
"sha256",
1313
"sha512"
1414
],
1515
"keyval": {
16-
"public": "c15703fe858491eb71333222bd1d3ae9a1b12a2ad6da855a0bb87cc62bdcb1db"
16+
"public": "9ed3a9ac657799f44fd22c9cd3b569c68e9327dca9690419bc97288bea5b6389"
1717
}
1818
},
19-
"5bba1132b50cab237959cf28b8471e22b448f618078934e4a551b42956cc2aeb": {
19+
"5910c46dd13c76aac66a1931d6267de258b3017f44b8015f46d4b61524fb1e3d": {
2020
"keytype": "ed25519",
2121
"scheme": "ed25519",
2222
"keyid_hash_algorithms": [
2323
"sha256",
2424
"sha512"
2525
],
2626
"keyval": {
27-
"public": "cabab661f4fbe2a5149f46d1749d4d31275ef3c253c42ab43c23a7defd83e9e2"
27+
"public": "7ea730fa36d4181f89bd24580a91fd22de991a7e220fbcbda8c602f1ffbe06fc"
2828
}
2929
},
30-
"5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971": {
30+
"de5f7af766270e2e22ca1ee043a5ff217b66639b3023d65aad9632df1e79e7b9": {
3131
"keytype": "ed25519",
3232
"scheme": "ed25519",
3333
"keyid_hash_algorithms": [
3434
"sha256",
3535
"sha512"
3636
],
3737
"keyval": {
38-
"public": "2153df976dd0916189119c20c833d3feea9b8f03e638c30ea86138106ba195f1"
38+
"public": "508f01013c2dd120425291227553c5595b736f02a044606537a75ecdbd686b81"
3939
}
4040
},
41-
"86ea80bbb0d782cc9ad0cb509cdcee05cccb70b22287d1506660f0c4882d899b": {
41+
"ecdb1e8e97ee7300b1158718d5390d622b560bec16e21a7f4e2ceb3b0b8e3da1": {
4242
"keytype": "ed25519",
4343
"scheme": "ed25519",
4444
"keyid_hash_algorithms": [
4545
"sha256",
4646
"sha512"
4747
],
4848
"keyval": {
49-
"public": "d56d7d86bdc349455a9353b850b5c5482178cfd427db91a26fd76379ee422ac6"
49+
"public": "6c672e33e09fe3b3a4f7db624c9e797951df092325195f757c974c8578eafb30"
5050
}
5151
}
5252
},
5353
"roles": {
5454
"root": {
5555
"keyids": [
56-
"5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971"
56+
"de5f7af766270e2e22ca1ee043a5ff217b66639b3023d65aad9632df1e79e7b9"
5757
],
5858
"threshold": 1
5959
},
6060
"snapshot": {
6161
"keyids": [
62-
"5bba1132b50cab237959cf28b8471e22b448f618078934e4a551b42956cc2aeb"
62+
"0d940e166ae0568ea03cc478aa85b1665f7f92a35d7999575e31b21e408f487d"
6363
],
6464
"threshold": 1
6565
},
6666
"targets": {
6767
"keyids": [
68-
"86ea80bbb0d782cc9ad0cb509cdcee05cccb70b22287d1506660f0c4882d899b"
68+
"5910c46dd13c76aac66a1931d6267de258b3017f44b8015f46d4b61524fb1e3d"
6969
],
7070
"threshold": 1
7171
},
7272
"timestamp": {
7373
"keyids": [
74-
"4b6e470a6ae80de875a55e14ebb6f237d849afb159b9702d52a0e83a094eb79e"
74+
"ecdb1e8e97ee7300b1158718d5390d622b560bec16e21a7f4e2ceb3b0b8e3da1"
7575
],
7676
"threshold": 1
7777
}
@@ -80,8 +80,8 @@
8080
},
8181
"signatures": [
8282
{
83-
"keyid": "5e981e578c6182ef0d8b74de7507a503eadb940e9f7ab4a1bff2f6ed5d9ee971",
84-
"sig": "491a3f69cc2aa878e0caa1b8f5488f69c1c0ebac08b2a655110454c21fe166245554eaf5d9c3b83a01a5fff9eb4c2b70cfb8af53b576193a746d404ea30a920e"
83+
"keyid": "de5f7af766270e2e22ca1ee043a5ff217b66639b3023d65aad9632df1e79e7b9",
84+
"sig": "0600abd72979dfe964f5dfdb204534545dc7f885bc3ee3e035488f29f90d2852070aeae1ae397a7dd1cda507ef4317edf056ac9ce88a23ae78d1fbbaf6a7df06"
8585
}
8686
]
8787
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,75 +3,75 @@
33
"_type": "root",
44
"spec_version": "1.0",
55
"version": 1,
6-
"expires": "2025-10-02T16:41:39-04:00",
6+
"expires": "2026-01-01T13:21:04+01:00",
77
"keys": {
8-
"066ddc8f2c0d25760fc9e4658a6d0eac30a51a18269ace25a28ca49a1fc30879": {
8+
"05768da397654761017646fe48c7250b634ccb72ebbb817d97757d2a4ca0d0b1": {
99
"keytype": "ed25519",
1010
"scheme": "ed25519",
1111
"keyid_hash_algorithms": [
1212
"sha256",
1313
"sha512"
1414
],
1515
"keyval": {
16-
"public": "54a45a46b845410c3c8f6c4ff0e06cfe464c28fb3ba8de9f700c5e0786b9ca71"
16+
"public": "2e14b5f6e51038c8eed39cea5921f25f5d8c1229e1afd6903b749d049eebdf28"
1717
}
1818
},
19-
"18547878bd70556810872a823a9458361643b3b194cb156da16db9cdea4bf8e7": {
19+
"77935fd26e2f5431b14cdb2d7d833f7e894cbe3c9d476a4b0cd2140d9f2a8406": {
2020
"keytype": "ed25519",
2121
"scheme": "ed25519",
2222
"keyid_hash_algorithms": [
2323
"sha256",
2424
"sha512"
2525
],
2626
"keyval": {
27-
"public": "3f1d6918348063f2f80e9ed607a806be559fd447153ff1829b0ac8af52f374ba"
27+
"public": "831694438642cf2f0dda68234089a20464f23a766e858b341747f931bde8577c"
2828
}
2929
},
30-
"6f682eb905b869b071295765b11f35cc4e4378ba6c57f363d0334224223c5cbe": {
30+
"b805e2101b437ba4f99d2eba0eabb8144d8795822ff726e5704ba2e7faa73c4c": {
3131
"keytype": "ed25519",
3232
"scheme": "ed25519",
3333
"keyid_hash_algorithms": [
3434
"sha256",
3535
"sha512"
3636
],
3737
"keyval": {
38-
"public": "606d869497cb773c0571b7a36a78bffa6088f54ddfc97b971bf08dce335d4345"
38+
"public": "8d931de7b0b98a9b852805866a9b624e26158a0ba7890f6048a48a2d3e68d0aa"
3939
}
4040
},
41-
"98664c4f0dd10825afe47c106451b15d9ed92599d48099584a7e48de77a404d1": {
41+
"f1469ae619f991d435ba37096ea88d3eec4ddd1b17c02bd72478e05bce3fb24c": {
4242
"keytype": "ed25519",
4343
"scheme": "ed25519",
4444
"keyid_hash_algorithms": [
4545
"sha256",
4646
"sha512"
4747
],
4848
"keyval": {
49-
"public": "eaf623556540a9ccc698ab7776322ff1ed69670c0190c67ff0d0e1ad358324a7"
49+
"public": "677cb8610efc92280d5a41ae782e20c65b4e14b6629a54db8ebd31af602886ee"
5050
}
5151
}
5252
},
5353
"roles": {
5454
"root": {
5555
"keyids": [
56-
"066ddc8f2c0d25760fc9e4658a6d0eac30a51a18269ace25a28ca49a1fc30879"
56+
"b805e2101b437ba4f99d2eba0eabb8144d8795822ff726e5704ba2e7faa73c4c"
5757
],
5858
"threshold": 1
5959
},
6060
"snapshot": {
6161
"keyids": [
62-
"18547878bd70556810872a823a9458361643b3b194cb156da16db9cdea4bf8e7"
62+
"f1469ae619f991d435ba37096ea88d3eec4ddd1b17c02bd72478e05bce3fb24c"
6363
],
6464
"threshold": 1
6565
},
6666
"targets": {
6767
"keyids": [
68-
"98664c4f0dd10825afe47c106451b15d9ed92599d48099584a7e48de77a404d1"
68+
"05768da397654761017646fe48c7250b634ccb72ebbb817d97757d2a4ca0d0b1"
6969
],
7070
"threshold": 1
7171
},
7272
"timestamp": {
7373
"keyids": [
74-
"6f682eb905b869b071295765b11f35cc4e4378ba6c57f363d0334224223c5cbe"
74+
"77935fd26e2f5431b14cdb2d7d833f7e894cbe3c9d476a4b0cd2140d9f2a8406"
7575
],
7676
"threshold": 1
7777
}
@@ -80,8 +80,8 @@
8080
},
8181
"signatures": [
8282
{
83-
"keyid": "066ddc8f2c0d25760fc9e4658a6d0eac30a51a18269ace25a28ca49a1fc30879",
84-
"sig": "9f854fc523bb70d92ab3e4c0e142864013a3ed78f405fc9dd6d45800ec2477631df58429f3f083873cabbd49229c56828a3da59271180cd3de84ce0b28d5530c"
83+
"keyid": "b805e2101b437ba4f99d2eba0eabb8144d8795822ff726e5704ba2e7faa73c4c",
84+
"sig": "e52a6087280190750f5d0653f79b42b6d504a5c6eceae569cf6ad726e58cd9588748dda451a1feddaf8e7e5bfa7f18b8b7ed4beb37cd988398cebadf6c6f7c06"
8585
}
8686
]
8787
}

0 commit comments

Comments
 (0)