Skip to content

Commit 29330a8

Browse files
authored
Merge pull request #55 from smallstep/herman/scep-provisioner-decrypter
Add SCEPDecrypter configuration
2 parents a0363d0 + 7d2f2f7 commit 29330a8

File tree

8 files changed

+249
-119
lines changed

8 files changed

+249
-119
lines changed

admin.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eab.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

majordomo.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

majordomo_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

policy.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

provisioners.pb.go

Lines changed: 233 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/linkedca/provisioners.proto

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,22 @@ message K8sSAProvisioner {
168168

169169
message SSHPOPProvisioner {}
170170

171+
message SCEPDecrypter {
172+
bytes certificate = 1;
173+
bytes key = 2;
174+
string key_uri = 3;
175+
bytes key_password = 4;
176+
}
177+
171178
message SCEPProvisioner {
172179
bool force_cn = 1;
173180
string challenge = 2;
174181
repeated string capabilities = 3;
175182
int32 minimum_public_key_length = 4;
176183
bool include_root = 5;
177184
int32 encryption_algorithm_identifier = 6;
185+
SCEPDecrypter decrypter = 7;
186+
bool exclude_intermediate = 8;
178187
}
179188

180189
message NebulaProvisioner {
@@ -196,6 +205,7 @@ message Webhook {
196205
ENRICHING = 1;
197206
AUTHORIZING = 2;
198207
SCEPCHALLENGE = 3;
208+
NOTIFYING = 4;
199209
}
200210
enum CertType {
201211
ALL = 0;

0 commit comments

Comments
 (0)