From 3698c11328e4fc16bc6a71589b7e11612404c0af Mon Sep 17 00:00:00 2001 From: Hayden Blauzvern Date: Tue, 19 Apr 2022 19:45:50 +0000 Subject: [PATCH] Update comment to specify support public key types Signed-off-by: Hayden Blauzvern --- fulcio.proto | 3 ++- fulcio_legacy.proto | 5 +++-- pkg/generated/protobuf/fulcio.pb.go | 3 ++- pkg/generated/protobuf/legacy/fulcio_legacy.pb.go | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fulcio.proto b/fulcio.proto index cbe02e314..58524af15 100644 --- a/fulcio.proto +++ b/fulcio.proto @@ -94,7 +94,8 @@ message PublicKey { */ PublicKeyAlgorithm algorithm = 1; /* - * PEM encoded public key + * PKIX, ASN.1 DER or PEM-encoded public key. PEM is typically + * of type PUBLIC KEY. */ string content = 2 [(google.api.field_behavior) = REQUIRED]; } diff --git a/fulcio_legacy.proto b/fulcio_legacy.proto index 0c0d9a499..2b1728bfb 100644 --- a/fulcio_legacy.proto +++ b/fulcio_legacy.proto @@ -68,7 +68,7 @@ message CreateSigningCertificateRequest { (google.api.field_behavior) = OPTIONAL ]; /* - * Optional: PKCS#10 encoded certificate signing request + * Optional: PKCS#10 PEM-encoded certificate signing request * Contains the public key to be stored in the requested * certificate. All other CSR fields are ignored. Since * the CSR is self-signed, it also acts as a proof of @@ -86,7 +86,8 @@ message PublicKey { */ string algorithm = 1 [ deprecated=true ]; /* - * DER or PEM encoded public key + * PKIX, ASN.1 DER or PEM-encoded public key. PEM is typically + * of type PUBLIC KEY. */ bytes content = 2 [ deprecated=true, diff --git a/pkg/generated/protobuf/fulcio.pb.go b/pkg/generated/protobuf/fulcio.pb.go index 2baf38fcd..263c78db6 100644 --- a/pkg/generated/protobuf/fulcio.pb.go +++ b/pkg/generated/protobuf/fulcio.pb.go @@ -326,7 +326,8 @@ type PublicKey struct { // The cryptographic algorithm to use with the key material Algorithm PublicKeyAlgorithm `protobuf:"varint,1,opt,name=algorithm,proto3,enum=dev.sigstore.fulcio.v2.PublicKeyAlgorithm" json:"algorithm,omitempty"` // - // PEM encoded public key + // PKIX, ASN.1 DER or PEM-encoded public key. PEM is typically + // of type PUBLIC KEY. Content string `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` } diff --git a/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go b/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go index 768c55882..75161372e 100644 --- a/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go +++ b/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go @@ -54,7 +54,7 @@ type CreateSigningCertificateRequest struct { // Deprecated: Do not use. SignedEmailAddress []byte `protobuf:"bytes,2,opt,name=signedEmailAddress,proto3" json:"signedEmailAddress,omitempty"` // - // Optional: PKCS#10 encoded certificate signing request + // Optional: PKCS#10 PEM-encoded certificate signing request // Contains the public key to be stored in the requested // certificate. All other CSR fields are ignored. Since // the CSR is self-signed, it also acts as a proof of @@ -131,7 +131,8 @@ type PublicKey struct { // Deprecated: Do not use. Algorithm string `protobuf:"bytes,1,opt,name=algorithm,proto3" json:"algorithm,omitempty"` // - // DER or PEM encoded public key + // PKIX, ASN.1 DER or PEM-encoded public key. PEM is typically + // of type PUBLIC KEY. // // Deprecated: Do not use. Content []byte `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`