From 94bb72dfa51acbf38fad94e80903eff94fef9039 Mon Sep 17 00:00:00 2001 From: Herman Slatman Date: Thu, 9 Jul 2026 18:24:07 +0200 Subject: [PATCH] Add `ANDROID_KEY` attestation format --- acme.pb.go | 4 ++-- admin.pb.go | 4 ++-- config.pb.go | 4 ++-- eab.pb.go | 4 ++-- majordomo.pb.go | 4 ++-- majordomo_grpc.pb.go | 2 +- policy.pb.go | 4 ++-- provisioners.pb.go | 30 +++++++++++++++++------------- spec/linkedca/provisioners.proto | 1 + 9 files changed, 31 insertions(+), 26 deletions(-) diff --git a/acme.pb.go b/acme.pb.go index 8537c5f..c6b7254 100644 --- a/acme.pb.go +++ b/acme.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/acme.proto package linkedca diff --git a/admin.pb.go b/admin.pb.go index b7ad264..13c0eb1 100644 --- a/admin.pb.go +++ b/admin.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/admin.proto package linkedca diff --git a/config.pb.go b/config.pb.go index 72f34a4..615e97d 100644 --- a/config.pb.go +++ b/config.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/config.proto package linkedca diff --git a/eab.pb.go b/eab.pb.go index 40e5999..d5c5f69 100644 --- a/eab.pb.go +++ b/eab.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/eab.proto package linkedca diff --git a/majordomo.pb.go b/majordomo.pb.go index dbc6588..4a01eec 100644 --- a/majordomo.pb.go +++ b/majordomo.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/majordomo.proto package linkedca diff --git a/majordomo_grpc.pb.go b/majordomo_grpc.pb.go index 0c609d8..aca54c7 100644 --- a/majordomo_grpc.pb.go +++ b/majordomo_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v6.32.1 +// - protoc v7.35.1 // source: linkedca/majordomo.proto package linkedca diff --git a/policy.pb.go b/policy.pb.go index 8fc68d9..8cc82b1 100644 --- a/policy.pb.go +++ b/policy.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/policy.proto package linkedca diff --git a/provisioners.pb.go b/provisioners.pb.go index 69130d1..e4349f4 100644 --- a/provisioners.pb.go +++ b/provisioners.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.9 -// protoc v6.32.1 +// protoc-gen-go v1.36.11 +// protoc v7.35.1 // source: linkedca/provisioners.proto package linkedca @@ -156,10 +156,11 @@ func (ACMEProvisioner_ChallengeType) EnumDescriptor() ([]byte, []int) { type ACMEProvisioner_AttestationFormatType int32 const ( - ACMEProvisioner_NONE ACMEProvisioner_AttestationFormatType = 0 - ACMEProvisioner_APPLE ACMEProvisioner_AttestationFormatType = 1 - ACMEProvisioner_STEP ACMEProvisioner_AttestationFormatType = 2 - ACMEProvisioner_TPM ACMEProvisioner_AttestationFormatType = 3 + ACMEProvisioner_NONE ACMEProvisioner_AttestationFormatType = 0 + ACMEProvisioner_APPLE ACMEProvisioner_AttestationFormatType = 1 + ACMEProvisioner_STEP ACMEProvisioner_AttestationFormatType = 2 + ACMEProvisioner_TPM ACMEProvisioner_AttestationFormatType = 3 + ACMEProvisioner_ANDROID_KEY ACMEProvisioner_AttestationFormatType = 4 ) // Enum value maps for ACMEProvisioner_AttestationFormatType. @@ -169,12 +170,14 @@ var ( 1: "APPLE", 2: "STEP", 3: "TPM", + 4: "ANDROID_KEY", } ACMEProvisioner_AttestationFormatType_value = map[string]int32{ - "NONE": 0, - "APPLE": 1, - "STEP": 2, - "TPM": 3, + "NONE": 0, + "APPLE": 1, + "STEP": 2, + "TPM": 3, + "ANDROID_KEY": 4, } ) @@ -2288,7 +2291,7 @@ const file_linkedca_provisioners_proto_rawDesc = "" + "\x1adisable_trust_on_first_use\x18\x05 \x01(\bR\x16disableTrustOnFirstUse\x12)\n" + "\x10subscription_ids\x18\x06 \x03(\tR\x0fsubscriptionIds\x12\x1d\n" + "\n" + - "object_ids\x18\a \x03(\tR\tobjectIds\"\xaf\x04\n" + + "object_ids\x18\a \x03(\tR\tobjectIds\"\xc0\x04\n" + "\x0fACMEProvisioner\x12\x19\n" + "\bforce_cn\x18\x01 \x01(\bR\aforceCn\x12\x1f\n" + "\vrequire_eab\x18\x02 \x01(\bR\n" + @@ -2307,12 +2310,13 @@ const file_linkedca_provisioners_proto_rawDesc = "" + "\n" + "\x06DNS_01\x10\x02\x12\x0f\n" + "\vTLS_ALPN_01\x10\x03\x12\x14\n" + - "\x10DEVICE_ATTEST_01\x10\x04\"?\n" + + "\x10DEVICE_ATTEST_01\x10\x04\"P\n" + "\x15AttestationFormatType\x12\b\n" + "\x04NONE\x10\x00\x12\t\n" + "\x05APPLE\x10\x01\x12\b\n" + "\x04STEP\x10\x02\x12\a\n" + - "\x03TPM\x10\x03\"&\n" + + "\x03TPM\x10\x03\x12\x0f\n" + + "\vANDROID_KEY\x10\x04\"&\n" + "\x0eX5CProvisioner\x12\x14\n" + "\x05roots\x18\x01 \x03(\fR\x05roots\"3\n" + "\x10K8sSAProvisioner\x12\x1f\n" + diff --git a/spec/linkedca/provisioners.proto b/spec/linkedca/provisioners.proto index 7c8a5ba..363fe01 100644 --- a/spec/linkedca/provisioners.proto +++ b/spec/linkedca/provisioners.proto @@ -152,6 +152,7 @@ message ACMEProvisioner { APPLE = 1; STEP = 2; TPM = 3; + ANDROID_KEY = 4; } bool force_cn = 1; bool require_eab = 2;