Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions hack/gentestdata/gentestdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ import (
"crypto/rand"
"crypto/x509"
"crypto/x509/pkix"
"encoding/hex"
"encoding/pem"
"flag"
"fmt"
"log"
"math/big"
"os"
Expand Down Expand Up @@ -215,14 +217,22 @@ func populateLogIDs(sigstoreKeys *config.SigstoreKeys) error {
if err != nil {
return err
}
sigstoreKeys.Tlogs[i].LogId = &config.LogID{KeyId: []byte(logID)}
logIDBytes, err := hex.DecodeString(logID)
if err != nil {
return fmt.Errorf("failed to decode tlog LogID: %w", err)
}
sigstoreKeys.Tlogs[i].LogId = &config.LogID{KeyId: logIDBytes}
}
for i := range sigstoreKeys.Ctlogs {
logID, err := genLogID(sigstoreKeys.Ctlogs[i].PublicKey.RawBytes)
if err != nil {
return err
}
sigstoreKeys.Ctlogs[i].LogId = &config.LogID{KeyId: []byte(logID)}
logIDBytes, err := hex.DecodeString(logID)
if err != nil {
return fmt.Errorf("failed to decode ctlog LogID: %w", err)
}
sigstoreKeys.Ctlogs[i].LogId = &config.LogID{KeyId: logIDBytes}
}
return nil
}
Expand Down
7 changes: 6 additions & 1 deletion pkg/apis/config/sigstore_keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rsa"
"encoding/hex"
"encoding/pem"
"fmt"

Expand Down Expand Up @@ -166,13 +167,17 @@ func ConvertTransparencyLogInstance(source v1alpha1.TransparencyLogInstance) (*p
if err != nil {
return nil, err
}
logIDBytes, err := hex.DecodeString(logID)
if err != nil {
return nil, fmt.Errorf("failed to decode LogID: %w", err)
}

return &pbtrustroot.TransparencyLogInstance{
BaseUrl: source.BaseURL.String(),
HashAlgorithm: HashStringToHashAlgorithm(source.HashAlgorithm),
PublicKey: pbpk,
LogId: &pbcommon.LogId{
KeyId: []byte(logID),
KeyId: logIDBytes,
},
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trustroot/testdata/ctfeLogID.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
acf17f453fd18a03c80421956827a165a8e35745a5b9316cd6653e0e74dd8564
6535e233e5fdda81457be67eea2c3e38e161504c7e431b1eda5c125a2002301d
4 changes: 2 additions & 2 deletions pkg/reconciler/trustroot/testdata/ctfePublicKey.pem
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES9xB42oHdFluiw6wANt/niwGlhq0
laU5Q+KylSiS3I2UZUDp1P/8GdZEeLjryi9WzBdUCGIkeaPwKU5kCAfvCg==
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYNjT4Xc2ppshhLUESZAjwgTG8KPR
TzrHijEZtWBtUHAB2SFWxYply2rymo6gNkbL9Mt6X/mLMDw44b2jYf8R7g==
-----END PUBLIC KEY-----
26 changes: 13 additions & 13 deletions pkg/reconciler/trustroot/testdata/fulcioCertChain.pem
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
-----BEGIN CERTIFICATE-----
MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2
MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDzENMAsGA1UEAxMEbGVhZjBZMBMG
ByqGSM49AgEGCCqGSM49AwEHA0IABOfGXx7fja6RGX/fdxhqS729rrPLoC3SnOYk
XLsulTveNatUD/aWj+Pm6lmMgu7XmAwJey7X1eDOY82krp1Glq6jMzAxMA4GA1Ud
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS+/yTu0t5fZADYyn/09SEqotouYTAKBggq
hkjOPQQDAgNJADBGAiEA3Ilo1dUM0DpSf8gudhY4WE0dyT33XpzDhTpc/rcK/jEC
IQC5y6ZZrXHdhF4SmgMFJV8B/ELPBaSv1IVw63ot9KfTlA==
MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDzENMAsGA1UEAxMEbGVhZjBZMBMG
ByqGSM49AgEGCCqGSM49AwEHA0IABN/rCcQAWj40WzyJFJyberUeo0gXkctI/7FO
5U/SxCVwjGPEpGDCcdLAGJ8aFnlRh8P570NkJyLw1aHYXhnOOG6jMzAxMA4GA1Ud
DwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS714qEdqvbbWMxCu5XU8t02VnnPTAKBggq
hkjOPQQDAgNJADBGAiEAjOL+MHpQdYlhim2VTgC2X1F5Sw+H5Y7LpVAAeV+6+nEC
IQDxe4JgvrSU0w6Lw8ZeHj+EsPwZu4sMaWG3itHxf5/GOA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2
MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDTELMAkGA1UEAxMCY2EwWTATBgcq
hkjOPQIBBggqhkjOPQMBBwNCAAQJAmqunDp6ckWG0Ab/Hv78Rx7z6xSMBrPOHv8M
OswZ71IfzouT4HSZm7BXp/YwLx6zmYzDpA3W34WOtT0SzKpho0IwQDAOBgNVHQ8B
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUvv8k7tLeX2QA2Mp/
9PUhKqLaLmEwCgYIKoZIzj0EAwIDSAAwRQIhALQkjwjY33JokfG+ncPDepGgFJYa
LrWYxFCRuk0375ecAiAqqB9ACUPxR/1BUo3ipnSSaaUUlK5ksytaKKFp2Ae24g==
MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2
MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDTELMAkGA1UEAxMCY2EwWTATBgcq
hkjOPQIBBggqhkjOPQMBBwNCAAQioOFQ3s+IOprqRpW+KnoaeMhbG4ltedtGebgr
JKjvShgQn3e8O47GrdVEdFuXVGp81KwCXcwDzNQUge7IcIzvo0IwQDAOBgNVHQ8B
Af8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu9eKhHar221jMQru
V1PLdNlZ5z0wCgYIKoZIzj0EAwIDSQAwRgIhAOQyIx3t5Ky+bioMbAcRHSL76LVb
r0hLkwxs/o3HwWs3AiEAti3GH0ebqH8PBjy0GNXk0og2ZC4Q4GhLi++otLCqfTU=
-----END CERTIFICATE-----
16 changes: 8 additions & 8 deletions pkg/reconciler/trustroot/testdata/marshalledEntry.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"baseUrl": "https://rekor.example.com",
"hashAlgorithm": "SHA2_256",
"publicKey": {
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwrI7C8wbl+f4MLhj+zPh41uV6tGeXYHtaX6AkQ1c11pJzEb1Whj1s7zmarVwulTiEMqsX6qstjWzcA8ocY/mbQ==",
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzmiyjrvz19Hmf+gyQ2RUVjhEzyVICG/TK9Zcf3brcM4VtRMAdmmytIVqjdW31Z9/UejfJq+ZjBU5xv4jwcUBmQ==",
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
"validFor": {
"start": "1970-01-01T00:00:00Z"
}
},
"logId": {
"keyId": "ZDEyZDVkOWFhNDE5NzRhNTg1OTYxZDE2MTI1MGNkMTVmMTFlNTJhNzdlM2ExY2RmZDFkZTM2MDViZDA0ZGYwNA=="
"keyId": "fADwHyhaM1PO0Hr3PEnTeBapk1tOmZjZeZWcm1Jho3U="
}
}
],
Expand All @@ -26,10 +26,10 @@
"certChain": {
"certificates": [
{
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOfGXx7fja6RGX/fdxhqS729rrPLoC3SnOYkXLsulTveNatUD/aWj+Pm6lmMgu7XmAwJey7X1eDOY82krp1Glq6jMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS+/yTu0t5fZADYyn/09SEqotouYTAKBggqhkjOPQQDAgNJADBGAiEA3Ilo1dUM0DpSf8gudhY4WE0dyT33XpzDhTpc/rcK/jECIQC5y6ZZrXHdhF4SmgMFJV8B/ELPBaSv1IVw63ot9KfTlA=="
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN/rCcQAWj40WzyJFJyberUeo0gXkctI/7FO5U/SxCVwjGPEpGDCcdLAGJ8aFnlRh8P570NkJyLw1aHYXhnOOG6jMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS714qEdqvbbWMxCu5XU8t02VnnPTAKBggqhkjOPQQDAgNJADBGAiEAjOL+MHpQdYlhim2VTgC2X1F5Sw+H5Y7LpVAAeV+6+nECIQDxe4JgvrSU0w6Lw8ZeHj+EsPwZu4sMaWG3itHxf5/GOA=="
},
{
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQJAmqunDp6ckWG0Ab/Hv78Rx7z6xSMBrPOHv8MOswZ71IfzouT4HSZm7BXp/YwLx6zmYzDpA3W34WOtT0SzKpho0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUvv8k7tLeX2QA2Mp/9PUhKqLaLmEwCgYIKoZIzj0EAwIDSAAwRQIhALQkjwjY33JokfG+ncPDepGgFJYaLrWYxFCRuk0375ecAiAqqB9ACUPxR/1BUo3ipnSSaaUUlK5ksytaKKFp2Ae24g=="
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQioOFQ3s+IOprqRpW+KnoaeMhbG4ltedtGebgrJKjvShgQn3e8O47GrdVEdFuXVGp81KwCXcwDzNQUge7IcIzvo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu9eKhHar221jMQruV1PLdNlZ5z0wCgYIKoZIzj0EAwIDSQAwRgIhAOQyIx3t5Ky+bioMbAcRHSL76LVbr0hLkwxs/o3HwWs3AiEAti3GH0ebqH8PBjy0GNXk0og2ZC4Q4GhLi++otLCqfTU="
}
]
},
Expand All @@ -43,14 +43,14 @@
"baseUrl": "https://ctfe.example.com",
"hashAlgorithm": "SHA2_256",
"publicKey": {
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES9xB42oHdFluiw6wANt/niwGlhq0laU5Q+KylSiS3I2UZUDp1P/8GdZEeLjryi9WzBdUCGIkeaPwKU5kCAfvCg==",
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYNjT4Xc2ppshhLUESZAjwgTG8KPRTzrHijEZtWBtUHAB2SFWxYply2rymo6gNkbL9Mt6X/mLMDw44b2jYf8R7g==",
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
"validFor": {
"start": "1970-01-01T00:00:00Z"
}
},
"logId": {
"keyId": "YWNmMTdmNDUzZmQxOGEwM2M4MDQyMTk1NjgyN2ExNjVhOGUzNTc0NWE1YjkzMTZjZDY2NTNlMGU3NGRkODU2NA=="
"keyId": "ZTXiM+X92oFFe+Z+6iw+OOFhUEx+Qxse2lwSWiACMB0="
}
}
],
Expand All @@ -64,10 +64,10 @@
"certChain": {
"certificates": [
{
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCNxMOw1rxPlbqRR1//XWhbUdr3Ss4TLOWwkDrgH6UKBYU2jAkR/vlNk8lsCWdVLRtrX5uk5kx6268+wzEak/m6jMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBSO60qMR9pTnfzXXM73hWw3um6d7DAKBggqhkjOPQQDAgNJADBGAiEAlx+K0sb82V8xiJDyV3CTQVKLyCGvIz9mLqpYHtm68tcCIQDpBXdPLgsBNnuNaAOTsGjIkbF+yih+0u4vMCQDoQ48vA=="
"rawBytes": "MIIBPTCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAOJTgHPothg44K6qtLYX05X6AeHl5SbSu40hs5fgUwxqM/q5dAkyLIFF97/EjFohTMf3TKUkoDKovPIOzOa5O6jMzAxMA4GA1UdDwEB/wQEAwIEEDAfBgNVHSMEGDAWgBTBiZBUV7Q6uzvzkdNs27ayNVqwmTAKBggqhkjOPQQDAgNIADBFAiB57pSBN27X8/xzO4xfELuI1ZNJn+d8qDllAq4aquKqMQIhAN4/ShbJXTbyLrn/PKwBkpnduey7EmXJlaQGEc5iYiWp"
},
{
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARnmSPSK4FXomdJHvVDqsVuI53ezlBNODUVK3pddglbjLrHzrWYFWddF7wh7IXYC92NfExAQJCYTHt7p2U7Xwi6o0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjutKjEfaU53811zO94VsN7punewwCgYIKoZIzj0EAwIDSQAwRgIhAIRRfwvlYsonpB3ta2VwKyl9xgzQT2kangYk/otGQ3aHAiEAlT7E7GIhH+pibEXnZ58YzmEJAcsb+ny3hc7mNjHwCz0="
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT+OCSU0aJP8LtLqbZdIUmoSyXGjaiQ6zqL10phyF0ARu5wwamIbX97E5VozjldlkCWonfSBJgCBuS5g6N4DxjYo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUwYmQVFe0Ors785HTbNu2sjVasJkwCgYIKoZIzj0EAwIDSAAwRQIhAJfUleJ643oEBQ9pe8FMZ3EDJ4hNACpr/jjxH8nM7bWiAiAweomZPvBZ9xJsFJZle2JWYAktziLNvvo53ny2bUqjHA=="
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
{
"hashAlgorithm": "SHA2_256",
"publicKey": {
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwrI7C8wbl+f4MLhj+zPh41uV6tGeXYHtaX6AkQ1c11pJzEb1Whj1s7zmarVwulTiEMqsX6qstjWzcA8ocY/mbQ==",
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzmiyjrvz19Hmf+gyQ2RUVjhEzyVICG/TK9Zcf3brcM4VtRMAdmmytIVqjdW31Z9/UejfJq+ZjBU5xv4jwcUBmQ==",
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
"validFor": {
"start": "1970-01-01T00:00:00Z"
}
},
"logId": {
"keyId": "ZDEyZDVkOWFhNDE5NzRhNTg1OTYxZDE2MTI1MGNkMTVmMTFlNTJhNzdlM2ExY2RmZDFkZTM2MDViZDA0ZGYwNA=="
"keyId": "fADwHyhaM1PO0Hr3PEnTeBapk1tOmZjZeZWcm1Jho3U="
}
}
],
Expand All @@ -19,10 +19,10 @@
"certChain": {
"certificates": [
{
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABOfGXx7fja6RGX/fdxhqS729rrPLoC3SnOYkXLsulTveNatUD/aWj+Pm6lmMgu7XmAwJey7X1eDOY82krp1Glq6jMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS+/yTu0t5fZADYyn/09SEqotouYTAKBggqhkjOPQQDAgNJADBGAiEA3Ilo1dUM0DpSf8gudhY4WE0dyT33XpzDhTpc/rcK/jECIQC5y6ZZrXHdhF4SmgMFJV8B/ELPBaSv1IVw63ot9KfTlA=="
"rawBytes": "MIIBPjCB5KADAgECAgECMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDzENMAsGA1UEAxMEbGVhZjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN/rCcQAWj40WzyJFJyberUeo0gXkctI/7FO5U/SxCVwjGPEpGDCcdLAGJ8aFnlRh8P570NkJyLw1aHYXhnOOG6jMzAxMA4GA1UdDwEB/wQEAwIGwDAfBgNVHSMEGDAWgBS714qEdqvbbWMxCu5XU8t02VnnPTAKBggqhkjOPQQDAgNJADBGAiEAjOL+MHpQdYlhim2VTgC2X1F5Sw+H5Y7LpVAAeV+6+nECIQDxe4JgvrSU0w6Lw8ZeHj+EsPwZu4sMaWG3itHxf5/GOA=="
},
{
"rawBytes": "MIIBSjCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyMDA5MDA0NloXDTM2MDcyMDA5MDA0NlowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQJAmqunDp6ckWG0Ab/Hv78Rx7z6xSMBrPOHv8MOswZ71IfzouT4HSZm7BXp/YwLx6zmYzDpA3W34WOtT0SzKpho0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUvv8k7tLeX2QA2Mp/9PUhKqLaLmEwCgYIKoZIzj0EAwIDSAAwRQIhALQkjwjY33JokfG+ncPDepGgFJYaLrWYxFCRuk0375ecAiAqqB9ACUPxR/1BUo3ipnSSaaUUlK5ksytaKKFp2Ae24g=="
"rawBytes": "MIIBSzCB8aADAgECAgEBMAoGCCqGSM49BAMCMA0xCzAJBgNVBAMTAmNhMB4XDTI2MDcyNzE1MjI0NVoXDTM2MDcyNzE1MjI0NVowDTELMAkGA1UEAxMCY2EwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQioOFQ3s+IOprqRpW+KnoaeMhbG4ltedtGebgrJKjvShgQn3e8O47GrdVEdFuXVGp81KwCXcwDzNQUge7IcIzvo0IwQDAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu9eKhHar221jMQruV1PLdNlZ5z0wCgYIKoZIzj0EAwIDSQAwRgIhAOQyIx3t5Ky+bioMbAcRHSL76LVbr0hLkwxs/o3HwWs3AiEAti3GH0ebqH8PBjy0GNXk0og2ZC4Q4GhLi++otLCqfTU="
}
]
},
Expand All @@ -35,14 +35,14 @@
{
"hashAlgorithm": "SHA2_256",
"publicKey": {
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES9xB42oHdFluiw6wANt/niwGlhq0laU5Q+KylSiS3I2UZUDp1P/8GdZEeLjryi9WzBdUCGIkeaPwKU5kCAfvCg==",
"rawBytes": "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEYNjT4Xc2ppshhLUESZAjwgTG8KPRTzrHijEZtWBtUHAB2SFWxYply2rymo6gNkbL9Mt6X/mLMDw44b2jYf8R7g==",
"keyDetails": "PKIX_ECDSA_P256_SHA_256",
"validFor": {
"start": "1970-01-01T00:00:00Z"
}
},
"logId": {
"keyId": "YWNmMTdmNDUzZmQxOGEwM2M4MDQyMTk1NjgyN2ExNjVhOGUzNTc0NWE1YjkzMTZjZDY2NTNlMGU3NGRkODU2NA=="
"keyId": "ZTXiM+X92oFFe+Z+6iw+OOFhUEx+Qxse2lwSWiACMB0="
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/trustroot/testdata/rekorLogID.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d12d5d9aa41974a585961d161250cd15f11e52a77e3a1cdfd1de3605bd04df04
7c00f01f285a3353ced07af73c49d37816a9935b4e9998d979959c9b5261a375
4 changes: 2 additions & 2 deletions pkg/reconciler/trustroot/testdata/rekorPublicKey.pem
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwrI7C8wbl+f4MLhj+zPh41uV6tGe
XYHtaX6AkQ1c11pJzEb1Whj1s7zmarVwulTiEMqsX6qstjWzcA8ocY/mbQ==
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEzmiyjrvz19Hmf+gyQ2RUVjhEzyVI
CG/TK9Zcf3brcM4VtRMAdmmytIVqjdW31Z9/UejfJq+ZjBU5xv4jwcUBmQ==
-----END PUBLIC KEY-----
30 changes: 15 additions & 15 deletions pkg/reconciler/trustroot/testdata/root.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,75 @@
"_type": "root",
"spec_version": "1.0",
"version": 1,
"expires": "2027-01-20T10:00:47Z",
"expires": "2027-01-27T16:22:46Z",
"keys": {
"32ff9c075bc05c7467312d969b8c5115751168e20f8b50d8f7338cf332a235cd": {
"3486ab200c1bba2553214f8fbd354e506eb2cc079260fec8568466d8905b3077": {
"keytype": "ed25519",
"scheme": "ed25519",
"keyid_hash_algorithms": [
"sha256",
"sha512"
],
"keyval": {
"public": "635b751227d765c699d45fb5d4486826f4d6cbb28aa633eb96851d3fb9004cb5"
"public": "1b6ad4d55414e0deb19b88ec5cb358e1e86219a91ad920287291392b1a3980c0"
}
},
"47461411ef034f8a16f5f4935e02270e34ff4cf123e681a9c6cdb7e5d2adce9b": {
"bfcba7c6106980cbd9d8831845e98f67eb3d744839ec014d4323be3b4beffc8c": {
"keytype": "ed25519",
"scheme": "ed25519",
"keyid_hash_algorithms": [
"sha256",
"sha512"
],
"keyval": {
"public": "cfd7d31f503e2610ff2978ba4737116ce924dbc462425ba2113b848e50b6345f"
"public": "6335210a26991d0fc4f8f0d5911c62e4154cd3ab149db420136ac2f3ec6be1d5"
}
},
"93e3b9e97fbeea85ec6be4643f7ed267b653cbab185d92b3b1fc746b5a797888": {
"ced8d630f608ae8723e9c8c3c6580734f6bbdbdeda24c253c1dce10b578c5636": {
"keytype": "ed25519",
"scheme": "ed25519",
"keyid_hash_algorithms": [
"sha256",
"sha512"
],
"keyval": {
"public": "8c339e1d5c57bd2639e244b579d78af0f138ab02c7f1ff63ee9452e3144b61f3"
"public": "8cde24b7d0e38f32770eb764522906a42d824a953ea7988fb8aad69f14194e0d"
}
},
"b2c50ac11772a239ea0be7aaa11a76d459fcd9ff00490fc1447a13651cd45c06": {
"d6b3c07f05ca8d1a97b3cf542c0d6c48c41e87b22042e62d88f3d6b9da3ef978": {
"keytype": "ed25519",
"scheme": "ed25519",
"keyid_hash_algorithms": [
"sha256",
"sha512"
],
"keyval": {
"public": "4a77e624e183b6d7e1e2986014c67b972de6c55eca337d1e67c1ad4dc9ae3a2f"
"public": "6ac9b5f37ef054728dde41385171392acdbfd754b1c4473528c3770dfd6a981a"
}
}
},
"roles": {
"root": {
"keyids": [
"b2c50ac11772a239ea0be7aaa11a76d459fcd9ff00490fc1447a13651cd45c06"
"bfcba7c6106980cbd9d8831845e98f67eb3d744839ec014d4323be3b4beffc8c"
],
"threshold": 1
},
"snapshot": {
"keyids": [
"93e3b9e97fbeea85ec6be4643f7ed267b653cbab185d92b3b1fc746b5a797888"
"d6b3c07f05ca8d1a97b3cf542c0d6c48c41e87b22042e62d88f3d6b9da3ef978"
],
"threshold": 1
},
"targets": {
"keyids": [
"32ff9c075bc05c7467312d969b8c5115751168e20f8b50d8f7338cf332a235cd"
"ced8d630f608ae8723e9c8c3c6580734f6bbdbdeda24c253c1dce10b578c5636"
],
"threshold": 1
},
"timestamp": {
"keyids": [
"47461411ef034f8a16f5f4935e02270e34ff4cf123e681a9c6cdb7e5d2adce9b"
"3486ab200c1bba2553214f8fbd354e506eb2cc079260fec8568466d8905b3077"
],
"threshold": 1
}
Expand All @@ -80,8 +80,8 @@
},
"signatures": [
{
"keyid": "b2c50ac11772a239ea0be7aaa11a76d459fcd9ff00490fc1447a13651cd45c06",
"sig": "c0f1067da018028debc0d4ea26c3398e4c9e1c5aa3f2854100a18066a074cbd10c35ab474a23d7c90e3ade481065bf066354615a3ccda1ffb5a3c11db4a2aa06"
"keyid": "bfcba7c6106980cbd9d8831845e98f67eb3d744839ec014d4323be3b4beffc8c",
"sig": "80ed319b70c5dbe81db7713cd824eaa8e5c7f24dd468120236de7dc96e42415280a15772d5176649bbcef5b88a40eb547f4990431cbad894a59de4486aef9207"
}
]
}
Loading
Loading