From c0b88632fffd99ff2f71c1f2692c6f3e4a43343c Mon Sep 17 00:00:00 2001 From: William Woodruff Date: Mon, 5 Feb 2024 11:37:13 +0100 Subject: [PATCH] drop PCKS1 key encodings Signed-off-by: William Woodruff --- .../ArtifactVerificationOptions.schema.json | 6 -- gen/jsonschema/schemas/Input.schema.json | 6 -- gen/jsonschema/schemas/PublicKey.schema.json | 6 -- .../schemas/PublicKeyIdentities.schema.json | 6 -- .../TransparencyLogInstance.schema.json | 6 -- .../schemas/TrustedRoot.schema.json | 6 -- gen/pb-go/common/v1/sigstore_common.pb.go | 95 ++++++------------- .../dev/sigstore/common/v1/__init__.py | 10 -- gen/pb-ruby/lib/sigstore_common_pb.rb | 6 -- .../ArtifactVerificationOptions.schema.json | 6 -- gen/pb-rust/schemas/Input.schema.json | 6 -- gen/pb-rust/schemas/PublicKey.schema.json | 6 -- .../schemas/PublicKeyIdentities.schema.json | 6 -- .../TransparencyLogInstance.schema.json | 6 -- gen/pb-rust/schemas/TrustedRoot.schema.json | 6 -- .../src/__generated__/sigstore_common.ts | 38 -------- protos/sigstore_common.proto | 10 +- 17 files changed, 32 insertions(+), 199 deletions(-) diff --git a/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json b/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json index 14d5b87e..88c1e8ca 100644 --- a/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json +++ b/gen/jsonschema/schemas/ArtifactVerificationOptions.schema.json @@ -133,12 +133,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/jsonschema/schemas/Input.schema.json b/gen/jsonschema/schemas/Input.schema.json index 47c9a150..8ff17674 100644 --- a/gen/jsonschema/schemas/Input.schema.json +++ b/gen/jsonschema/schemas/Input.schema.json @@ -263,12 +263,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/jsonschema/schemas/PublicKey.schema.json b/gen/jsonschema/schemas/PublicKey.schema.json index 611a6b53..2e7f6756 100644 --- a/gen/jsonschema/schemas/PublicKey.schema.json +++ b/gen/jsonschema/schemas/PublicKey.schema.json @@ -23,12 +23,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/jsonschema/schemas/PublicKeyIdentities.schema.json b/gen/jsonschema/schemas/PublicKeyIdentities.schema.json index 04d29766..f52c73f3 100644 --- a/gen/jsonschema/schemas/PublicKeyIdentities.schema.json +++ b/gen/jsonschema/schemas/PublicKeyIdentities.schema.json @@ -37,12 +37,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/jsonschema/schemas/TransparencyLogInstance.schema.json b/gen/jsonschema/schemas/TransparencyLogInstance.schema.json index 8d0ea883..d53179ea 100644 --- a/gen/jsonschema/schemas/TransparencyLogInstance.schema.json +++ b/gen/jsonschema/schemas/TransparencyLogInstance.schema.json @@ -72,12 +72,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/jsonschema/schemas/TrustedRoot.schema.json b/gen/jsonschema/schemas/TrustedRoot.schema.json index aa5baf05..2c142284 100644 --- a/gen/jsonschema/schemas/TrustedRoot.schema.json +++ b/gen/jsonschema/schemas/TrustedRoot.schema.json @@ -94,12 +94,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-go/common/v1/sigstore_common.pb.go b/gen/pb-go/common/v1/sigstore_common.pb.go index f627ae7a..61db9b36 100644 --- a/gen/pb-go/common/v1/sigstore_common.pb.go +++ b/gen/pb-go/common/v1/sigstore_common.pb.go @@ -139,14 +139,6 @@ const ( PublicKeyDetails_PKIX_RSA_PSS_2048_SHA256 PublicKeyDetails = 16 // See RFC4055 PublicKeyDetails_PKIX_RSA_PSS_3072_SHA256 PublicKeyDetails = 17 PublicKeyDetails_PKIX_RSA_PSS_4096_SHA256 PublicKeyDetails = 18 - // RSA public key in PKCS#1 format, PKCS#1v1.5 signature - PublicKeyDetails_PKCS1_RSA_PKCS1V15_2048_SHA256 PublicKeyDetails = 19 - PublicKeyDetails_PKCS1_RSA_PKCS1V15_3072_SHA256 PublicKeyDetails = 20 - PublicKeyDetails_PKCS1_RSA_PKCS1V15_4096_SHA256 PublicKeyDetails = 21 - // RSA public key in PKCS#1 format, RSASSA-PSS signature - PublicKeyDetails_PKCS1_RSA_PSS_2048_SHA256 PublicKeyDetails = 22 // See RFC4055 - PublicKeyDetails_PKCS1_RSA_PSS_3072_SHA256 PublicKeyDetails = 23 - PublicKeyDetails_PKCS1_RSA_PSS_4096_SHA256 PublicKeyDetails = 24 // ECDSA // // Deprecated: Do not use. @@ -176,12 +168,6 @@ var ( 16: "PKIX_RSA_PSS_2048_SHA256", 17: "PKIX_RSA_PSS_3072_SHA256", 18: "PKIX_RSA_PSS_4096_SHA256", - 19: "PKCS1_RSA_PKCS1V15_2048_SHA256", - 20: "PKCS1_RSA_PKCS1V15_3072_SHA256", - 21: "PKCS1_RSA_PKCS1V15_4096_SHA256", - 22: "PKCS1_RSA_PSS_2048_SHA256", - 23: "PKCS1_RSA_PSS_3072_SHA256", - 24: "PKCS1_RSA_PSS_4096_SHA256", 6: "PKIX_ECDSA_P256_HMAC_SHA_256", 5: "PKIX_ECDSA_P256_SHA_256", 12: "PKIX_ECDSA_P384_SHA_384", @@ -203,12 +189,6 @@ var ( "PKIX_RSA_PSS_2048_SHA256": 16, "PKIX_RSA_PSS_3072_SHA256": 17, "PKIX_RSA_PSS_4096_SHA256": 18, - "PKCS1_RSA_PKCS1V15_2048_SHA256": 19, - "PKCS1_RSA_PKCS1V15_3072_SHA256": 20, - "PKCS1_RSA_PKCS1V15_4096_SHA256": 21, - "PKCS1_RSA_PSS_2048_SHA256": 22, - "PKCS1_RSA_PSS_3072_SHA256": 23, - "PKCS1_RSA_PSS_4096_SHA256": 24, "PKIX_ECDSA_P256_HMAC_SHA_256": 6, "PKIX_ECDSA_P256_SHA_256": 5, "PKIX_ECDSA_P384_SHA_384": 12, @@ -1168,7 +1148,7 @@ var file_sigstore_common_proto_rawDesc = []byte{ 0x48, 0x41, 0x32, 0x5f, 0x33, 0x38, 0x34, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x48, 0x41, 0x32, 0x5f, 0x35, 0x31, 0x32, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x48, 0x41, 0x33, 0x5f, 0x32, 0x35, 0x36, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x48, 0x41, 0x33, 0x5f, 0x33, 0x38, - 0x34, 0x10, 0x05, 0x2a, 0x8a, 0x06, 0x0a, 0x10, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, + 0x34, 0x10, 0x05, 0x2a, 0xc1, 0x04, 0x0a, 0x10, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x5f, 0x4b, 0x45, 0x59, 0x5f, 0x44, 0x45, 0x54, 0x41, 0x49, 0x4c, 0x53, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x11, @@ -1190,49 +1170,36 @@ var file_sigstore_common_proto_rawDesc = []byte{ 0x41, 0x5f, 0x50, 0x53, 0x53, 0x5f, 0x33, 0x30, 0x37, 0x32, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x11, 0x12, 0x1c, 0x0a, 0x18, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, 0x53, 0x53, 0x5f, 0x34, 0x30, 0x39, 0x36, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, - 0x12, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x4b, 0x43, 0x53, 0x31, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, - 0x4b, 0x43, 0x53, 0x31, 0x56, 0x31, 0x35, 0x5f, 0x32, 0x30, 0x34, 0x38, 0x5f, 0x53, 0x48, 0x41, - 0x32, 0x35, 0x36, 0x10, 0x13, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x4b, 0x43, 0x53, 0x31, 0x5f, 0x52, - 0x53, 0x41, 0x5f, 0x50, 0x4b, 0x43, 0x53, 0x31, 0x56, 0x31, 0x35, 0x5f, 0x33, 0x30, 0x37, 0x32, - 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x14, 0x12, 0x22, 0x0a, 0x1e, 0x50, 0x4b, 0x43, - 0x53, 0x31, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, 0x4b, 0x43, 0x53, 0x31, 0x56, 0x31, 0x35, 0x5f, - 0x34, 0x30, 0x39, 0x36, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x15, 0x12, 0x1d, 0x0a, - 0x19, 0x50, 0x4b, 0x43, 0x53, 0x31, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, 0x53, 0x53, 0x5f, 0x32, - 0x30, 0x34, 0x38, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x16, 0x12, 0x1d, 0x0a, 0x19, - 0x50, 0x4b, 0x43, 0x53, 0x31, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, 0x53, 0x53, 0x5f, 0x33, 0x30, - 0x37, 0x32, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x17, 0x12, 0x1d, 0x0a, 0x19, 0x50, - 0x4b, 0x43, 0x53, 0x31, 0x5f, 0x52, 0x53, 0x41, 0x5f, 0x50, 0x53, 0x53, 0x5f, 0x34, 0x30, 0x39, - 0x36, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x18, 0x12, 0x24, 0x0a, 0x1c, 0x50, 0x4b, - 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x50, 0x32, 0x35, 0x36, 0x5f, 0x48, 0x4d, - 0x41, 0x43, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x32, 0x35, 0x36, 0x10, 0x06, 0x1a, 0x02, 0x08, 0x01, - 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x50, - 0x32, 0x35, 0x36, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x32, 0x35, 0x36, 0x10, 0x05, 0x12, 0x1b, 0x0a, - 0x17, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x50, 0x33, 0x38, 0x34, - 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x33, 0x38, 0x34, 0x10, 0x0c, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4b, - 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x50, 0x35, 0x32, 0x31, 0x5f, 0x53, 0x48, - 0x41, 0x5f, 0x35, 0x31, 0x32, 0x10, 0x0d, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x4b, 0x49, 0x58, 0x5f, - 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x07, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x4b, 0x49, - 0x58, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x5f, 0x50, 0x48, 0x10, 0x08, 0x12, 0x1b, - 0x0a, 0x17, 0x45, 0x58, 0x50, 0x45, 0x52, 0x49, 0x4d, 0x45, 0x4e, 0x54, 0x41, 0x4c, 0x5f, 0x4c, - 0x4d, 0x53, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x0e, 0x12, 0x1d, 0x0a, 0x19, 0x45, - 0x58, 0x50, 0x45, 0x52, 0x49, 0x4d, 0x45, 0x4e, 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x4d, 0x4f, 0x54, - 0x53, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x0f, 0x22, 0x04, 0x08, 0x19, 0x10, 0x32, - 0x2a, 0x6f, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, - 0x0a, 0x29, 0x53, 0x55, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x5f, 0x41, 0x4c, 0x54, 0x45, 0x52, 0x4e, - 0x41, 0x54, 0x49, 0x56, 0x45, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, - 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, - 0x05, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x55, 0x52, 0x49, 0x10, - 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x54, 0x48, 0x45, 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x10, - 0x03, 0x42, 0x7c, 0x0a, 0x1c, 0x64, 0x65, 0x76, 0x2e, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, - 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x69, 0x67, - 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2d, 0x73, - 0x70, 0x65, 0x63, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, 0x62, 0x2d, 0x67, 0x6f, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0xea, 0x02, 0x14, 0x53, 0x69, 0x67, 0x73, 0x74, - 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x12, 0x24, 0x0a, 0x1c, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, + 0x50, 0x32, 0x35, 0x36, 0x5f, 0x48, 0x4d, 0x41, 0x43, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x32, 0x35, + 0x36, 0x10, 0x06, 0x1a, 0x02, 0x08, 0x01, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4b, 0x49, 0x58, 0x5f, + 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, 0x50, 0x32, 0x35, 0x36, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x32, + 0x35, 0x36, 0x10, 0x05, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, + 0x53, 0x41, 0x5f, 0x50, 0x33, 0x38, 0x34, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x33, 0x38, 0x34, 0x10, + 0x0c, 0x12, 0x1b, 0x0a, 0x17, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x43, 0x44, 0x53, 0x41, 0x5f, + 0x50, 0x35, 0x32, 0x31, 0x5f, 0x53, 0x48, 0x41, 0x5f, 0x35, 0x31, 0x32, 0x10, 0x0d, 0x12, 0x10, + 0x0a, 0x0c, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, 0x10, 0x07, + 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x4b, 0x49, 0x58, 0x5f, 0x45, 0x44, 0x32, 0x35, 0x35, 0x31, 0x39, + 0x5f, 0x50, 0x48, 0x10, 0x08, 0x12, 0x1b, 0x0a, 0x17, 0x45, 0x58, 0x50, 0x45, 0x52, 0x49, 0x4d, + 0x45, 0x4e, 0x54, 0x41, 0x4c, 0x5f, 0x4c, 0x4d, 0x53, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, + 0x10, 0x0e, 0x12, 0x1d, 0x0a, 0x19, 0x45, 0x58, 0x50, 0x45, 0x52, 0x49, 0x4d, 0x45, 0x4e, 0x54, + 0x41, 0x4c, 0x5f, 0x4c, 0x4d, 0x4f, 0x54, 0x53, 0x5f, 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, + 0x0f, 0x22, 0x04, 0x08, 0x13, 0x10, 0x32, 0x2a, 0x6f, 0x0a, 0x1a, 0x53, 0x75, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x61, 0x6d, + 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x29, 0x53, 0x55, 0x42, 0x4a, 0x45, 0x43, 0x54, + 0x5f, 0x41, 0x4c, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x54, 0x49, 0x56, 0x45, 0x5f, 0x4e, 0x41, 0x4d, + 0x45, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, + 0x45, 0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x4d, 0x41, 0x49, 0x4c, 0x10, 0x01, 0x12, + 0x07, 0x0a, 0x03, 0x55, 0x52, 0x49, 0x10, 0x02, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x54, 0x48, 0x45, + 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x03, 0x42, 0x7c, 0x0a, 0x1c, 0x64, 0x65, 0x76, 0x2e, + 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2d, 0x73, 0x70, 0x65, 0x63, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x70, 0x62, 0x2d, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0xea, + 0x02, 0x14, 0x53, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3a, 0x3a, 0x43, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/gen/pb-python/sigstore_protobuf_specs/dev/sigstore/common/v1/__init__.py b/gen/pb-python/sigstore_protobuf_specs/dev/sigstore/common/v1/__init__.py index 32f02d0d..8679c035 100644 --- a/gen/pb-python/sigstore_protobuf_specs/dev/sigstore/common/v1/__init__.py +++ b/gen/pb-python/sigstore_protobuf_specs/dev/sigstore/common/v1/__init__.py @@ -62,16 +62,6 @@ class PublicKeyDetails(betterproto.Enum): PKIX_RSA_PSS_3072_SHA256 = 17 PKIX_RSA_PSS_4096_SHA256 = 18 - PKCS1_RSA_PKCS1V15_2048_SHA256 = 19 - """RSA public key in PKCS#1 format, PKCS#1v1.5 signature""" - - PKCS1_RSA_PKCS1V15_3072_SHA256 = 20 - PKCS1_RSA_PKCS1V15_4096_SHA256 = 21 - PKCS1_RSA_PSS_2048_SHA256 = 22 - """RSA public key in PKCS#1 format, RSASSA-PSS signature""" - - PKCS1_RSA_PSS_3072_SHA256 = 23 - PKCS1_RSA_PSS_4096_SHA256 = 24 PKIX_ECDSA_P256_HMAC_SHA_256 = 6 """ECDSA""" diff --git a/gen/pb-ruby/lib/sigstore_common_pb.rb b/gen/pb-ruby/lib/sigstore_common_pb.rb index 10624d56..a76a563f 100644 --- a/gen/pb-ruby/lib/sigstore_common_pb.rb +++ b/gen/pb-ruby/lib/sigstore_common_pb.rb @@ -78,12 +78,6 @@ value :PKIX_RSA_PSS_2048_SHA256, 16 value :PKIX_RSA_PSS_3072_SHA256, 17 value :PKIX_RSA_PSS_4096_SHA256, 18 - value :PKCS1_RSA_PKCS1V15_2048_SHA256, 19 - value :PKCS1_RSA_PKCS1V15_3072_SHA256, 20 - value :PKCS1_RSA_PKCS1V15_4096_SHA256, 21 - value :PKCS1_RSA_PSS_2048_SHA256, 22 - value :PKCS1_RSA_PSS_3072_SHA256, 23 - value :PKCS1_RSA_PSS_4096_SHA256, 24 value :PKIX_ECDSA_P256_HMAC_SHA_256, 6 value :PKIX_ECDSA_P256_SHA_256, 5 value :PKIX_ECDSA_P384_SHA_384, 12 diff --git a/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json b/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json index 14d5b87e..88c1e8ca 100644 --- a/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json +++ b/gen/pb-rust/schemas/ArtifactVerificationOptions.schema.json @@ -133,12 +133,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-rust/schemas/Input.schema.json b/gen/pb-rust/schemas/Input.schema.json index 47c9a150..8ff17674 100644 --- a/gen/pb-rust/schemas/Input.schema.json +++ b/gen/pb-rust/schemas/Input.schema.json @@ -263,12 +263,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-rust/schemas/PublicKey.schema.json b/gen/pb-rust/schemas/PublicKey.schema.json index 611a6b53..2e7f6756 100644 --- a/gen/pb-rust/schemas/PublicKey.schema.json +++ b/gen/pb-rust/schemas/PublicKey.schema.json @@ -23,12 +23,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-rust/schemas/PublicKeyIdentities.schema.json b/gen/pb-rust/schemas/PublicKeyIdentities.schema.json index 04d29766..f52c73f3 100644 --- a/gen/pb-rust/schemas/PublicKeyIdentities.schema.json +++ b/gen/pb-rust/schemas/PublicKeyIdentities.schema.json @@ -37,12 +37,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-rust/schemas/TransparencyLogInstance.schema.json b/gen/pb-rust/schemas/TransparencyLogInstance.schema.json index 8d0ea883..d53179ea 100644 --- a/gen/pb-rust/schemas/TransparencyLogInstance.schema.json +++ b/gen/pb-rust/schemas/TransparencyLogInstance.schema.json @@ -72,12 +72,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-rust/schemas/TrustedRoot.schema.json b/gen/pb-rust/schemas/TrustedRoot.schema.json index aa5baf05..2c142284 100644 --- a/gen/pb-rust/schemas/TrustedRoot.schema.json +++ b/gen/pb-rust/schemas/TrustedRoot.schema.json @@ -94,12 +94,6 @@ "PKIX_RSA_PSS_2048_SHA256", "PKIX_RSA_PSS_3072_SHA256", "PKIX_RSA_PSS_4096_SHA256", - "PKCS1_RSA_PKCS1V15_2048_SHA256", - "PKCS1_RSA_PKCS1V15_3072_SHA256", - "PKCS1_RSA_PKCS1V15_4096_SHA256", - "PKCS1_RSA_PSS_2048_SHA256", - "PKCS1_RSA_PSS_3072_SHA256", - "PKCS1_RSA_PSS_4096_SHA256", "PKIX_ECDSA_P256_HMAC_SHA_256", "PKIX_ECDSA_P256_SHA_256", "PKIX_ECDSA_P384_SHA_384", diff --git a/gen/pb-typescript/src/__generated__/sigstore_common.ts b/gen/pb-typescript/src/__generated__/sigstore_common.ts index 846cc6ba..5a199582 100644 --- a/gen/pb-typescript/src/__generated__/sigstore_common.ts +++ b/gen/pb-typescript/src/__generated__/sigstore_common.ts @@ -107,14 +107,6 @@ export enum PublicKeyDetails { PKIX_RSA_PSS_2048_SHA256 = 16, PKIX_RSA_PSS_3072_SHA256 = 17, PKIX_RSA_PSS_4096_SHA256 = 18, - /** PKCS1_RSA_PKCS1V15_2048_SHA256 - RSA public key in PKCS#1 format, PKCS#1v1.5 signature */ - PKCS1_RSA_PKCS1V15_2048_SHA256 = 19, - PKCS1_RSA_PKCS1V15_3072_SHA256 = 20, - PKCS1_RSA_PKCS1V15_4096_SHA256 = 21, - /** PKCS1_RSA_PSS_2048_SHA256 - RSA public key in PKCS#1 format, RSASSA-PSS signature */ - PKCS1_RSA_PSS_2048_SHA256 = 22, - PKCS1_RSA_PSS_3072_SHA256 = 23, - PKCS1_RSA_PSS_4096_SHA256 = 24, /** * PKIX_ECDSA_P256_HMAC_SHA_256 - ECDSA * @@ -168,24 +160,6 @@ export function publicKeyDetailsFromJSON(object: any): PublicKeyDetails { case 18: case "PKIX_RSA_PSS_4096_SHA256": return PublicKeyDetails.PKIX_RSA_PSS_4096_SHA256; - case 19: - case "PKCS1_RSA_PKCS1V15_2048_SHA256": - return PublicKeyDetails.PKCS1_RSA_PKCS1V15_2048_SHA256; - case 20: - case "PKCS1_RSA_PKCS1V15_3072_SHA256": - return PublicKeyDetails.PKCS1_RSA_PKCS1V15_3072_SHA256; - case 21: - case "PKCS1_RSA_PKCS1V15_4096_SHA256": - return PublicKeyDetails.PKCS1_RSA_PKCS1V15_4096_SHA256; - case 22: - case "PKCS1_RSA_PSS_2048_SHA256": - return PublicKeyDetails.PKCS1_RSA_PSS_2048_SHA256; - case 23: - case "PKCS1_RSA_PSS_3072_SHA256": - return PublicKeyDetails.PKCS1_RSA_PSS_3072_SHA256; - case 24: - case "PKCS1_RSA_PSS_4096_SHA256": - return PublicKeyDetails.PKCS1_RSA_PSS_4096_SHA256; case 6: case "PKIX_ECDSA_P256_HMAC_SHA_256": return PublicKeyDetails.PKIX_ECDSA_P256_HMAC_SHA_256; @@ -239,18 +213,6 @@ export function publicKeyDetailsToJSON(object: PublicKeyDetails): string { return "PKIX_RSA_PSS_3072_SHA256"; case PublicKeyDetails.PKIX_RSA_PSS_4096_SHA256: return "PKIX_RSA_PSS_4096_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PKCS1V15_2048_SHA256: - return "PKCS1_RSA_PKCS1V15_2048_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PKCS1V15_3072_SHA256: - return "PKCS1_RSA_PKCS1V15_3072_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PKCS1V15_4096_SHA256: - return "PKCS1_RSA_PKCS1V15_4096_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PSS_2048_SHA256: - return "PKCS1_RSA_PSS_2048_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PSS_3072_SHA256: - return "PKCS1_RSA_PSS_3072_SHA256"; - case PublicKeyDetails.PKCS1_RSA_PSS_4096_SHA256: - return "PKCS1_RSA_PSS_4096_SHA256"; case PublicKeyDetails.PKIX_ECDSA_P256_HMAC_SHA_256: return "PKIX_ECDSA_P256_HMAC_SHA_256"; case PublicKeyDetails.PKIX_ECDSA_P256_SHA_256: diff --git a/protos/sigstore_common.proto b/protos/sigstore_common.proto index ffe49c37..13a87ab5 100644 --- a/protos/sigstore_common.proto +++ b/protos/sigstore_common.proto @@ -74,14 +74,6 @@ enum PublicKeyDetails { PKIX_RSA_PSS_2048_SHA256 = 16; // See RFC4055 PKIX_RSA_PSS_3072_SHA256 = 17; PKIX_RSA_PSS_4096_SHA256 = 18; - // RSA public key in PKCS#1 format, PKCS#1v1.5 signature - PKCS1_RSA_PKCS1V15_2048_SHA256 = 19; - PKCS1_RSA_PKCS1V15_3072_SHA256 = 20; - PKCS1_RSA_PKCS1V15_4096_SHA256 = 21; - // RSA public key in PKCS#1 format, RSASSA-PSS signature - PKCS1_RSA_PSS_2048_SHA256 = 22; // See RFC4055 - PKCS1_RSA_PSS_3072_SHA256 = 23; - PKCS1_RSA_PSS_4096_SHA256 = 24; // ECDSA PKIX_ECDSA_P256_HMAC_SHA_256 = 6 [deprecated = true]; // See RFC6979 @@ -98,7 +90,7 @@ enum PublicKeyDetails { EXPERIMENTAL_LMOTS_SHA256 = 15; // Reserved for future additions of public key/signature algorithm types. - reserved 25 to 50; + reserved 19 to 50; } // HashOutput captures a digest of a 'message' (generic octet sequence)