On Tue, Oct 28, 2025 at 07:03:20PM +0100, Jonas Rebmann wrote: > Merge the exemplary keys copied in from [1] into a single pem file, > in a manner similar to test/self/development_rsa2048.pem for consistency > and to reduce clutter a bit. > > While at it, rename them from "fit-" to "snakeoil-" as they are not only > used for fit, but also for tlv integration tests, and to indicate more > clearly that these are publicly known keys.
Should we rather keep the "fit" name and add another key for tlv integration tests? Sascha > > [1] https://git.pengutronix.de/cgit/ptx-code-signing-dev/ > > Signed-off-by: Jonas Rebmann <[email protected]> > --- > crypto/Makefile | 8 +++--- > crypto/fit-4096-development.crt | 33 > ---------------------- > crypto/fit-ecdsa-development.key | 5 ---- > ...velopment.key => snakeoil-4096-development.pem} | 33 > ++++++++++++++++++++++ > ...elopment.crt => snakeoil-ecdsa-development.pem} | 5 ++++ > test/py/test_tlv.py | 8 +++--- > 6 files changed, 46 insertions(+), 46 deletions(-) > > diff --git a/crypto/Makefile b/crypto/Makefile > index cbc5f5235a..17043316c4 100644 > --- a/crypto/Makefile > +++ b/crypto/Makefile > @@ -33,12 +33,12 @@ CONFIG_CRYPTO_PUBLIC_KEYS := $(foreach > d,$(CONFIG_CRYPTO_PUBLIC_KEYS),"$(d)") > > ifdef CONFIG_CRYPTO_BUILTIN_DEVELOPMENT_KEYS > ifdef CONFIG_CRYPTO_RSA > -CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=fit,fit-hint=rsa-devel:$(srctree)/crypto/fit-4096-development.crt > -CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=tlv-generic:$(srctree)/crypto/fit-4096-development.crt > +CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=fit,fit-hint=rsa-devel:$(srctree)/crypto/snakeoil-4096-development.pem > +CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=tlv-generic:$(srctree)/crypto/snakeoil-4096-development.pem > endif > ifdef CONFIG_CRYPTO_ECDSA > -CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=fit,fit-hint=ecdsa-devel:$(srctree)/crypto/fit-ecdsa-development.crt > -CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=tlv-generic:$(srctree)/crypto/fit-ecdsa-development.crt > +CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=fit,fit-hint=ecdsa-devel:$(srctree)/crypto/snakeoil-ecdsa-development.pem > +CONFIG_CRYPTO_PUBLIC_KEYS += > keyring=tlv-generic:$(srctree)/crypto/snakeoil-ecdsa-development.pem > endif > endif > > diff --git a/crypto/fit-4096-development.crt b/crypto/fit-4096-development.crt > deleted file mode 100644 > index dffba216b9..0000000000 > --- a/crypto/fit-4096-development.crt > +++ /dev/null > @@ -1,33 +0,0 @@ > ------BEGIN CERTIFICATE----- > -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 > -Yu8PytQLFKL1pZU= > ------END CERTIFICATE----- > diff --git a/crypto/fit-ecdsa-development.key > b/crypto/fit-ecdsa-development.key > deleted file mode 100644 > index 2b13c877a3..0000000000 > --- a/crypto/fit-ecdsa-development.key > +++ /dev/null > @@ -1,5 +0,0 @@ > ------BEGIN EC PRIVATE KEY----- > -MHcCAQEEIEsUW5DEOhD1CYHCnPfDULwbRQO9Yjt2/xM5SoY2GUQtoAoGCCqGSM49 > -AwEHoUQDQgAEowCa2OYfPdGRr1JpSYONOA3N2jwJjGbPbfG6uBzKg1VqOOk0a/Vf > -BfEbQev6X96HCd6zvvC2tjBgvICW8UB0TQ== > ------END EC PRIVATE KEY----- > diff --git a/crypto/fit-4096-development.key > b/crypto/snakeoil-4096-development.pem > similarity index 61% > rename from crypto/fit-4096-development.key > rename to crypto/snakeoil-4096-development.pem > index 526cdfc2b5..039b74034d 100644 > --- a/crypto/fit-4096-development.key > +++ b/crypto/snakeoil-4096-development.pem > @@ -1,3 +1,36 @@ > +-----BEGIN CERTIFICATE----- > +MIIFpzCCA4+gAwIBAgIUFUQCZBUFYriH8+8jb1A9eJv5N30wDQYJKoZIhvcNAQEL > +BQAwXTEUMBIGA1UECgwLUGVuZ3V0cm9uaXgxIDAeBgNVBAMMF0RldmVsb3BtZW50 > +IHNpZ25pbmcga2V5MSMwIQYJKoZIhvcNAQkBFhRkZWJ1Z0BwZW5ndXRyb25peC5k > +ZTAgFw0xOTEwMDExMzA1MThaGA8yMTE5MDkwNzEzMDUxOFowXTEUMBIGA1UECgwL > +UGVuZ3V0cm9uaXgxIDAeBgNVBAMMF0RldmVsb3BtZW50IHNpZ25pbmcga2V5MSMw > +IQYJKoZIhvcNAQkBFhRkZWJ1Z0BwZW5ndXRyb25peC5kZTCCAiIwDQYJKoZIhvcN > +AQEBBQADggIPADCCAgoCggIBAMmR5Io1H6qALxBC2sUi548qoU6axIpZ3+yar0gj > +A1FF79nRJZNa+EcIgaMCaf+Ft7DseIAEhBzNsZQ1sj2GVEf9W7WXlSbziET1n8PC > +aC097W20kziMNOAZOjFIdy24AbcW2yhhpBXsKtzm9V0DlnGN2QM3yxbqKD1iUOl/ > +iInM5KwNKxp8KboR5W/LTnUGUYw3ryFVbxJEY0YqqwMOaSk8vzLf0iSf8gu6iabS > +ELJEONst0ah3glZj+mRelVdbHDZh6/PpEQ9fQ4QqLOgy1qtqQhT8J0poDOE9BVnC > +bDIjbWvq7UavpBu0YzjmG26r7pN75DK0E0UHgGH3Z7jhophkGMYlYfarjjFRujSd > +ocpU2tEvxDykFELyvQPG5w7pedtlz5jFRzrS11RrcCsfcUFMf9g+2qKpZlSUhkHg > +DDYtDRBYam7hnV7if9nCsLaGwpZM9Fm2zJSOFATO1eKj9yUpMYqI0SobTR7XRNyr > +Rd66J0SWlPsg4IDaG1i4ieE7UNDgAtURBCRqu7PZPAEovurPlV+8lbZRljCI2wRg > +JfJaoF17AKa0a5raH2kIBD1b3EgCG7nIfyaqR4bPLxwYlm/ymXTnv7zImEBP3ffy > +mPK8m2Wtw4Sr8ze1+fcpjmCyCxwe918YuW0AOtQ2nmBOCpz4iWhA61HHK5RYzASM > +Bq6LAgMBAAGjXTBbMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgeAMB0GA1UdDgQW > +BBRscfq3jG3UfwhRTQyiWoStdF/WFzAfBgNVHSMEGDAWgBRscfq3jG3UfwhRTQyi > +WoStdF/WFzANBgkqhkiG9w0BAQsFAAOCAgEAp6suTnOCSormgkuhopR5Sk0nl1ME > ++DSxB56E6HVOgP2lXfNAYtfjdZwPtD2cCMyZD9m0w5usXUb+XFzW4L4AFsBnwbuu > +3/082u/qF21v7sEhdi83p3ordHnevc5HTTN0mfUNlqsCG+sCL+w+IQEWvHii4Hnc > +MPv6xbEhxU0ahTpByFwj0+YFPMq4nwQi6pqZCCP7qm0UV+T5+W8CnCivDq9laX+g > +RyJIPgH67ZFQlnnhjSqNq+7yF3Ac0U3IcMKSMaCOCIxuh+QfgHqE9jP62pRblpJx > +UPX5WF9/tBQ7757UEj+nHRKpgnJQzQ6Ks8/7FVmvbY9g9KWEIfeULsT8M1qMdW1E > +bZqleKhEySQbqUyIM29SpIfqd8unBecKFELfVf47TTEbWQRSExRMDGs31MXnvsiP > +jCSW7+BZNBwRXAyR3jB2ludw7DpZJk/VzTf2tja/FPl0sGSG0ggdmGHDnvHApQn5 > +RidvJEyQSv+hfn6x+wE0nWpY2/+bV9RvOPwZnLsYkb9falnLwBlTpwa2uX6o4LP1 > +8orfuQn3SrfRRKuaVwzjRvkb2fw15745mmOWK/VVtrHD8B3kA6cmTW3JEace+wma > +qCeFbwawz4vZpYCV4hQm06YefDRwZ4zBnkPnkN8i0Wqnb2kJUk5YrWKMZyFagAFU > +Yu8PytQLFKL1pZU= > +-----END CERTIFICATE----- > -----BEGIN RSA PRIVATE KEY----- > MIIJKgIBAAKCAgEAyZHkijUfqoAvEELaxSLnjyqhTprEilnf7JqvSCMDUUXv2dEl > k1r4RwiBowJp/4W3sOx4gASEHM2xlDWyPYZUR/1btZeVJvOIRPWfw8JoLT3tbbST > diff --git a/crypto/fit-ecdsa-development.crt > b/crypto/snakeoil-ecdsa-development.pem > similarity index 76% > rename from crypto/fit-ecdsa-development.crt > rename to crypto/snakeoil-ecdsa-development.pem > index 490d48b93a..aeb0764d55 100644 > --- a/crypto/fit-ecdsa-development.crt > +++ b/crypto/snakeoil-ecdsa-development.pem > @@ -11,3 +11,8 @@ > VR0PBAQDAgeAMB0GA1UdDgQWBBQ5gyCsUddXXclJHHRUH+w2+R0N2jAKBggqhkjO > PQQDAgNIADBFAiAfMkyM1n7JYCYqvYq4YdbWD8q2kZvVYhRK7gKIRZNUjAIhAKng > 1plXACT2UcKDQV9+o3qbve9LDV3aASRmZz47DX+0 > -----END CERTIFICATE----- > +-----BEGIN EC PRIVATE KEY----- > +MHcCAQEEIEsUW5DEOhD1CYHCnPfDULwbRQO9Yjt2/xM5SoY2GUQtoAoGCCqGSM49 > +AwEHoUQDQgAEowCa2OYfPdGRr1JpSYONOA3N2jwJjGbPbfG6uBzKg1VqOOk0a/Vf > +BfEbQev6X96HCd6zvvC2tjBgvICW8UB0TQ== > +-----END EC PRIVATE KEY----- > diff --git a/test/py/test_tlv.py b/test/py/test_tlv.py > index 9fb3110cb8..49c53fe39b 100644 > --- a/test/py/test_tlv.py > +++ b/test/py/test_tlv.py > @@ -94,10 +94,10 @@ class _TLV_Testdata: > self.data = self.scripts_dir / "data-example.yaml" > self.schema = self.scripts_dir / "schema-example.yaml" > self.generator_py = self.scripts_dir / "bareboxtlv-generator.py" > - self.privkey_rsa = Path("crypto/fit-4096-development.key") > - self.pubkey_rsa = Path("crypto/fit-4096-development.crt") > - self.privkey_ecdsa = Path("crypto/fit-ecdsa-development.key") > - self.pubkey_ecdsa = Path("crypto/fit-ecdsa-development.crt") > + self.privkey_rsa = Path("crypto/snakeoil-4096-development.pem") > + self.pubkey_rsa = Path("crypto/snakeoil-4096-development.pem") > + self.privkey_ecdsa = Path("crypto/snakeoil-ecdsa-development.pem") > + self.pubkey_ecdsa = Path("crypto/snakeoil-ecdsa-development.pem") > self.unsigned_bin = self.dir / "unsigned.tlv" > self.corrupted_bin = self.dir / "unsigned_corrupted.tlv" > self.signed_bin = self.dir / "signed.tlv" > > -- > 2.51.2.535.g419c72cb8a > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
