diff --git a/kms/grpcurl-sheet.md b/kms/grpcurl-sheet.md
index 3b05e860c964906a21fd95bd374568d8aece9412..4aa7776be086d815e9b4b64cdc59847949ea83d5 100644
--- a/kms/grpcurl-sheet.md
+++ b/kms/grpcurl-sheet.md
@@ -7,4 +7,4 @@ https://github.com/fullstorydev/grpcurl
'grpcurl -d '{"myKmsName" : "grpcurl"}' --import-path ./kmsetsiproto --proto kmsetsiproto.proto --plaintext localhost:50900 kmsetsiproto.KmsETSI.ETSICapabilities
{ "peerKmsName": "whatever"}'
-'grpcurl -d '{"kmsPeerSocket" : "127.0.0.1:59090"}' --import-path ./kmsetsiproto --proto kmsetsiproto.proto --plaintext localhost:50900 kmsetsiproto.KmsETSI.ETSIAddKMSPeer'
\ No newline at end of file
+'grpcurl -d '{"kmsPeerSocket" : "127.0.0.1:50901"}' --import-path ./kmsetsiproto --proto kmsetsiproto.proto --plaintext localhost:50900 kmsetsiproto.KmsETSI.ETSIAddKMSPeer'
\ No newline at end of file
diff --git a/kms/kmsetsi.go b/kms/kmsetsi.go
index 51ac91f9f6ee3ec24411e96e292793923df92295..e864d7b25bffb33de9662d1ceddc4dc7bf96305f 100644
--- a/kms/kmsetsi.go
+++ b/kms/kmsetsi.go
@@ -46,6 +46,14 @@ func (es *etsiServer) ETSIRemoveKMSPeer(ctx context.Context, in *pb.ETSIKMSPeerR
}, nil
}
+func (es *etsiServer) ETSIGetPeerList(ctx context.Context, in *pb.ETSIKMSPeerListRequest) (*pb.ETSIKMSPeerListReply, error) {
+
+ return &pb.ETSIKMSPeerListReply{
+ PeerName: "X",
+ PeerStatus: "Y",
+ }, nil
+}
+
func (es *etsiServer) GetEncryptKeys256Bit(ctx context.Context, in *pb.ETSIGetEncryptKeys256BitRequest) (*pb.ETSIGetEncryptKeys256BitReply, error) {
log.Printf("Received request for n=%d keys", in.GetAmount())
diff --git a/kms/kmsintercom.go b/kms/kmsintercom.go
index 3add9db9838ae5c0e24205edc68df51868bd022e..56444531e5b5267e5857e8864fb026cab62a538f 100644
--- a/kms/kmsintercom.go
+++ b/kms/kmsintercom.go
@@ -23,6 +23,13 @@ func (s *kmsTalkerServer) InterComCapabilities(ctx context.Context, in *pb.Inter
}, nil
}
+func (s *kmsTalkerServer) InterComKeyTransportSessionHandling(ctx context.Context, in *pb.InterComKeyTransportSessionHandlingRequest) (*pb.InterComKeyTransportSessionHandlingReply, error) {
+
+ return &pb.InterComKeyTransportSessionHandlingReply{
+ UsedKey: "whatever",
+ }, nil
+}
+
func StartInterComm(interComPort int) {
flag.Parse()
diff --git a/kms/kmspeers.go b/kms/kmspeers.go
index 9fd85c73af73d6a195d525aac2b2cf9d27875f08..37dc1d67928f17a7299fa857ef2affcdaeaa75f1 100644
--- a/kms/kmspeers.go
+++ b/kms/kmspeers.go
@@ -63,6 +63,9 @@ func (ph *kmsPeer) PeerHandler(kmsName string) {
ph.peerStatus = kmsPeerDown
return
}
- log.Printf("Greeting: %s", r.GetPeerKmsName())
+ // Works and peer moves to kmsPeerUp
+ ph.peerStatus = kmsPeerUp
+
+ log.Printf("Greeting: %s which is now in peerStatus %d", r.GetPeerKmsName(), ph.peerStatus)
}
diff --git a/kmsetsiproto/kmsetsiproto.pb.go b/kmsetsiproto/kmsetsiproto.pb.go
index beb011c03f75f680e9484031fb857418a08b2938..0df25eda0dc3493c2c6bf5d076713f27a5ad8386 100644
--- a/kmsetsiproto/kmsetsiproto.pb.go
+++ b/kmsetsiproto/kmsetsiproto.pb.go
@@ -210,6 +210,99 @@ func (x *ETSIKMSPeerReply) GetKmsPeerName() string {
return ""
}
+type ETSIKMSPeerListRequest struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *ETSIKMSPeerListRequest) Reset() {
+ *x = ETSIKMSPeerListRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_kmsetsiproto_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ETSIKMSPeerListRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ETSIKMSPeerListRequest) ProtoMessage() {}
+
+func (x *ETSIKMSPeerListRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_kmsetsiproto_proto_msgTypes[4]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ETSIKMSPeerListRequest.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeerListRequest) Descriptor() ([]byte, []int) {
+ return file_kmsetsiproto_proto_rawDescGZIP(), []int{4}
+}
+
+type ETSIKMSPeerListReply struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ PeerName string `protobuf:"bytes,1,opt,name=peerName,proto3" json:"peerName,omitempty"`
+ PeerStatus string `protobuf:"bytes,2,opt,name=peerStatus,proto3" json:"peerStatus,omitempty"`
+}
+
+func (x *ETSIKMSPeerListReply) Reset() {
+ *x = ETSIKMSPeerListReply{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_kmsetsiproto_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ETSIKMSPeerListReply) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ETSIKMSPeerListReply) ProtoMessage() {}
+
+func (x *ETSIKMSPeerListReply) ProtoReflect() protoreflect.Message {
+ mi := &file_kmsetsiproto_proto_msgTypes[5]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ETSIKMSPeerListReply.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeerListReply) Descriptor() ([]byte, []int) {
+ return file_kmsetsiproto_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *ETSIKMSPeerListReply) GetPeerName() string {
+ if x != nil {
+ return x.PeerName
+ }
+ return ""
+}
+
+func (x *ETSIKMSPeerListReply) GetPeerStatus() string {
+ if x != nil {
+ return x.PeerStatus
+ }
+ return ""
+}
+
type ETSIGetEncryptKeys256BitRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -221,7 +314,7 @@ type ETSIGetEncryptKeys256BitRequest struct {
func (x *ETSIGetEncryptKeys256BitRequest) Reset() {
*x = ETSIGetEncryptKeys256BitRequest{}
if protoimpl.UnsafeEnabled {
- mi := &file_kmsetsiproto_proto_msgTypes[4]
+ mi := &file_kmsetsiproto_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -234,7 +327,7 @@ func (x *ETSIGetEncryptKeys256BitRequest) String() string {
func (*ETSIGetEncryptKeys256BitRequest) ProtoMessage() {}
func (x *ETSIGetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
- mi := &file_kmsetsiproto_proto_msgTypes[4]
+ mi := &file_kmsetsiproto_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -247,7 +340,7 @@ func (x *ETSIGetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ETSIGetEncryptKeys256BitRequest.ProtoReflect.Descriptor instead.
func (*ETSIGetEncryptKeys256BitRequest) Descriptor() ([]byte, []int) {
- return file_kmsetsiproto_proto_rawDescGZIP(), []int{4}
+ return file_kmsetsiproto_proto_rawDescGZIP(), []int{6}
}
func (x *ETSIGetEncryptKeys256BitRequest) GetAmount() int64 {
@@ -269,7 +362,7 @@ type ETSIGetEncryptKeys256BitReply struct {
func (x *ETSIGetEncryptKeys256BitReply) Reset() {
*x = ETSIGetEncryptKeys256BitReply{}
if protoimpl.UnsafeEnabled {
- mi := &file_kmsetsiproto_proto_msgTypes[5]
+ mi := &file_kmsetsiproto_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -282,7 +375,7 @@ func (x *ETSIGetEncryptKeys256BitReply) String() string {
func (*ETSIGetEncryptKeys256BitReply) ProtoMessage() {}
func (x *ETSIGetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
- mi := &file_kmsetsiproto_proto_msgTypes[5]
+ mi := &file_kmsetsiproto_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -295,7 +388,7 @@ func (x *ETSIGetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
// Deprecated: Use ETSIGetEncryptKeys256BitReply.ProtoReflect.Descriptor instead.
func (*ETSIGetEncryptKeys256BitReply) Descriptor() ([]byte, []int) {
- return file_kmsetsiproto_proto_rawDescGZIP(), []int{5}
+ return file_kmsetsiproto_proto_rawDescGZIP(), []int{7}
}
func (x *ETSIGetEncryptKeys256BitReply) GetKeyID() string {
@@ -331,45 +424,58 @@ var file_kmsetsiproto_proto_rawDesc = []byte{
0x65, 0x74, 0x22, 0x34, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x6b, 0x6d, 0x73, 0x50, 0x65, 0x65,
0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6b, 0x6d, 0x73,
- 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x54, 0x53, 0x49,
- 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35,
- 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61,
- 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f,
- 0x75, 0x6e, 0x74, 0x22, 0x47, 0x0a, 0x1d, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e,
- 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
- 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0x94, 0x03, 0x0a,
- 0x07, 0x4b, 0x6d, 0x73, 0x45, 0x54, 0x53, 0x49, 0x12, 0x60, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49,
- 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b,
+ 0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x45, 0x54, 0x53, 0x49,
+ 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x22, 0x52, 0x0a, 0x14, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
+ 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65,
+ 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65,
+ 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x65, 0x72, 0x53, 0x74,
+ 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x65, 0x72,
+ 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65,
+ 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42,
+ 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f,
+ 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
+ 0x74, 0x22, 0x47, 0x0a, 0x1d, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72,
+ 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xf3, 0x03, 0x0a, 0x07, 0x4b,
+ 0x6d, 0x73, 0x45, 0x54, 0x53, 0x49, 0x12, 0x60, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61,
+ 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73,
+ 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61,
+ 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x1a, 0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65,
+ 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x54, 0x0a, 0x0e, 0x45, 0x54, 0x53, 0x49,
+ 0x41, 0x64, 0x64, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73,
+ 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d,
+ 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b,
0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49,
- 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74,
- 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x54, 0x0a, 0x0e, 0x45, 0x54,
- 0x53, 0x49, 0x41, 0x64, 0x64, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b,
- 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49,
- 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e,
- 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54,
- 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00,
- 0x12, 0x57, 0x0a, 0x11, 0x45, 0x54, 0x53, 0x49, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d,
- 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
+ 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x57,
+ 0x0a, 0x11, 0x45, 0x54, 0x53, 0x49, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d, 0x53, 0x50,
+ 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72,
- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73,
- 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65,
- 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x18, 0x45, 0x54, 0x53,
- 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32,
- 0x35, 0x36, 0x42, 0x69, 0x74, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72,
- 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79,
- 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c,
- 0x79, 0x22, 0x00, 0x42, 0x37, 0x5a, 0x35, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e,
- 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65,
- 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f,
- 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x33,
+ 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x0f, 0x45, 0x54, 0x53, 0x49, 0x47,
+ 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x6b, 0x6d, 0x73,
+ 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d,
+ 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x1a, 0x22, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+ 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52,
+ 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x18, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65,
+ 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42,
+ 0x69, 0x74, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74,
+ 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b,
+ 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00,
+ 0x42, 0x37, 0x5a, 0x35, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64,
+ 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65, 0x72, 0x6c, 0x69,
+ 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f, 0x6b, 0x6d, 0x73,
+ 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
}
var (
@@ -384,26 +490,30 @@ func file_kmsetsiproto_proto_rawDescGZIP() []byte {
return file_kmsetsiproto_proto_rawDescData
}
-var file_kmsetsiproto_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_kmsetsiproto_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
var file_kmsetsiproto_proto_goTypes = []interface{}{
(*ETSICapabilitiesRequest)(nil), // 0: kmsetsiproto.ETSICapabilitiesRequest
(*ETSICapabilitiesReply)(nil), // 1: kmsetsiproto.ETSICapabilitiesReply
(*ETSIKMSPeerRequest)(nil), // 2: kmsetsiproto.ETSIKMSPeerRequest
(*ETSIKMSPeerReply)(nil), // 3: kmsetsiproto.ETSIKMSPeerReply
- (*ETSIGetEncryptKeys256BitRequest)(nil), // 4: kmsetsiproto.ETSIGetEncryptKeys256BitRequest
- (*ETSIGetEncryptKeys256BitReply)(nil), // 5: kmsetsiproto.ETSIGetEncryptKeys256BitReply
+ (*ETSIKMSPeerListRequest)(nil), // 4: kmsetsiproto.ETSIKMSPeerListRequest
+ (*ETSIKMSPeerListReply)(nil), // 5: kmsetsiproto.ETSIKMSPeerListReply
+ (*ETSIGetEncryptKeys256BitRequest)(nil), // 6: kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+ (*ETSIGetEncryptKeys256BitReply)(nil), // 7: kmsetsiproto.ETSIGetEncryptKeys256BitReply
}
var file_kmsetsiproto_proto_depIdxs = []int32{
0, // 0: kmsetsiproto.KmsETSI.ETSICapabilities:input_type -> kmsetsiproto.ETSICapabilitiesRequest
2, // 1: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
2, // 2: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
- 4, // 3: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:input_type -> kmsetsiproto.ETSIGetEncryptKeys256BitRequest
- 1, // 4: kmsetsiproto.KmsETSI.ETSICapabilities:output_type -> kmsetsiproto.ETSICapabilitiesReply
- 3, // 5: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
- 3, // 6: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
- 5, // 7: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:output_type -> kmsetsiproto.ETSIGetEncryptKeys256BitReply
- 4, // [4:8] is the sub-list for method output_type
- 0, // [0:4] is the sub-list for method input_type
+ 4, // 3: kmsetsiproto.KmsETSI.ETSIGetPeerList:input_type -> kmsetsiproto.ETSIKMSPeerListRequest
+ 6, // 4: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:input_type -> kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+ 1, // 5: kmsetsiproto.KmsETSI.ETSICapabilities:output_type -> kmsetsiproto.ETSICapabilitiesReply
+ 3, // 6: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+ 3, // 7: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+ 5, // 8: kmsetsiproto.KmsETSI.ETSIGetPeerList:output_type -> kmsetsiproto.ETSIKMSPeerListReply
+ 7, // 9: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:output_type -> kmsetsiproto.ETSIGetEncryptKeys256BitReply
+ 5, // [5:10] is the sub-list for method output_type
+ 0, // [0:5] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] is the sub-list for field type_name
@@ -464,7 +574,7 @@ func file_kmsetsiproto_proto_init() {
}
}
file_kmsetsiproto_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ETSIGetEncryptKeys256BitRequest); i {
+ switch v := v.(*ETSIKMSPeerListRequest); i {
case 0:
return &v.state
case 1:
@@ -476,6 +586,30 @@ func file_kmsetsiproto_proto_init() {
}
}
file_kmsetsiproto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ETSIKMSPeerListReply); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_kmsetsiproto_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ETSIGetEncryptKeys256BitRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_kmsetsiproto_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ETSIGetEncryptKeys256BitReply); i {
case 0:
return &v.state
@@ -494,7 +628,7 @@ func file_kmsetsiproto_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_kmsetsiproto_proto_rawDesc,
NumEnums: 0,
- NumMessages: 6,
+ NumMessages: 8,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/kmsetsiproto/kmsetsiproto.proto b/kmsetsiproto/kmsetsiproto.proto
index 509ba95b4f9ad2838c1ab1e15104e2423966435c..fea368f7efbed18d796eb7539f0c753f87a0a3f5 100644
--- a/kmsetsiproto/kmsetsiproto.proto
+++ b/kmsetsiproto/kmsetsiproto.proto
@@ -9,6 +9,7 @@ service KmsETSI {
rpc ETSICapabilities (ETSICapabilitiesRequest) returns (ETSICapabilitiesReply) {}
rpc ETSIAddKMSPeer(ETSIKMSPeerRequest) returns (ETSIKMSPeerReply) {}
rpc ETSIRemoveKMSPeer(ETSIKMSPeerRequest) returns (ETSIKMSPeerReply) {}
+ rpc ETSIGetPeerList(ETSIKMSPeerListRequest) returns (ETSIKMSPeerListReply) {}
rpc ETSIGetEncryptKeys256Bit (ETSIGetEncryptKeys256BitRequest) returns (ETSIGetEncryptKeys256BitReply) {}
}
@@ -30,12 +31,18 @@ message ETSIKMSPeerReply {
string kmsPeerName = 1;
}
+message ETSIKMSPeerListRequest {
+}
+
+message ETSIKMSPeerListReply {
+ string peerName = 1;
+ string peerStatus = 2;
+}
message ETSIGetEncryptKeys256BitRequest {
int64 amount = 1;
}
-
/* out kms-keystore.go
* type kmsKSElement struct {
* keyID string
diff --git a/kmsetsiproto/kmsetsiproto_grpc.pb.go b/kmsetsiproto/kmsetsiproto_grpc.pb.go
index 4ad7251e415f8f64ecbba729051f13e4dddce8d6..7aefb1ef1e3b77d9fdac5b8e687c3d125d6c217e 100644
--- a/kmsetsiproto/kmsetsiproto_grpc.pb.go
+++ b/kmsetsiproto/kmsetsiproto_grpc.pb.go
@@ -26,6 +26,7 @@ type KmsETSIClient interface {
ETSICapabilities(ctx context.Context, in *ETSICapabilitiesRequest, opts ...grpc.CallOption) (*ETSICapabilitiesReply, error)
ETSIAddKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error)
ETSIRemoveKMSPeer(ctx context.Context, in *ETSIKMSPeerRequest, opts ...grpc.CallOption) (*ETSIKMSPeerReply, error)
+ ETSIGetPeerList(ctx context.Context, in *ETSIKMSPeerListRequest, opts ...grpc.CallOption) (*ETSIKMSPeerListReply, error)
ETSIGetEncryptKeys256Bit(ctx context.Context, in *ETSIGetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*ETSIGetEncryptKeys256BitReply, error)
}
@@ -64,6 +65,15 @@ func (c *kmsETSIClient) ETSIRemoveKMSPeer(ctx context.Context, in *ETSIKMSPeerRe
return out, nil
}
+func (c *kmsETSIClient) ETSIGetPeerList(ctx context.Context, in *ETSIKMSPeerListRequest, opts ...grpc.CallOption) (*ETSIKMSPeerListReply, error) {
+ out := new(ETSIKMSPeerListReply)
+ err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSIGetPeerList", in, out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *kmsETSIClient) ETSIGetEncryptKeys256Bit(ctx context.Context, in *ETSIGetEncryptKeys256BitRequest, opts ...grpc.CallOption) (*ETSIGetEncryptKeys256BitReply, error) {
out := new(ETSIGetEncryptKeys256BitReply)
err := c.cc.Invoke(ctx, "/kmsetsiproto.KmsETSI/ETSIGetEncryptKeys256Bit", in, out, opts...)
@@ -81,6 +91,7 @@ type KmsETSIServer interface {
ETSICapabilities(context.Context, *ETSICapabilitiesRequest) (*ETSICapabilitiesReply, error)
ETSIAddKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error)
ETSIRemoveKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error)
+ ETSIGetPeerList(context.Context, *ETSIKMSPeerListRequest) (*ETSIKMSPeerListReply, error)
ETSIGetEncryptKeys256Bit(context.Context, *ETSIGetEncryptKeys256BitRequest) (*ETSIGetEncryptKeys256BitReply, error)
mustEmbedUnimplementedKmsETSIServer()
}
@@ -98,6 +109,9 @@ func (UnimplementedKmsETSIServer) ETSIAddKMSPeer(context.Context, *ETSIKMSPeerRe
func (UnimplementedKmsETSIServer) ETSIRemoveKMSPeer(context.Context, *ETSIKMSPeerRequest) (*ETSIKMSPeerReply, error) {
return nil, status.Errorf(codes.Unimplemented, "method ETSIRemoveKMSPeer not implemented")
}
+func (UnimplementedKmsETSIServer) ETSIGetPeerList(context.Context, *ETSIKMSPeerListRequest) (*ETSIKMSPeerListReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method ETSIGetPeerList not implemented")
+}
func (UnimplementedKmsETSIServer) ETSIGetEncryptKeys256Bit(context.Context, *ETSIGetEncryptKeys256BitRequest) (*ETSIGetEncryptKeys256BitReply, error) {
return nil, status.Errorf(codes.Unimplemented, "method ETSIGetEncryptKeys256Bit not implemented")
}
@@ -168,6 +182,24 @@ func _KmsETSI_ETSIRemoveKMSPeer_Handler(srv interface{}, ctx context.Context, de
return interceptor(ctx, in, info, handler)
}
+func _KmsETSI_ETSIGetPeerList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(ETSIKMSPeerListRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(KmsETSIServer).ETSIGetPeerList(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: "/kmsetsiproto.KmsETSI/ETSIGetPeerList",
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(KmsETSIServer).ETSIGetPeerList(ctx, req.(*ETSIKMSPeerListRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
func _KmsETSI_ETSIGetEncryptKeys256Bit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(ETSIGetEncryptKeys256BitRequest)
if err := dec(in); err != nil {
@@ -205,6 +237,10 @@ var KmsETSI_ServiceDesc = grpc.ServiceDesc{
MethodName: "ETSIRemoveKMSPeer",
Handler: _KmsETSI_ETSIRemoveKMSPeer_Handler,
},
+ {
+ MethodName: "ETSIGetPeerList",
+ Handler: _KmsETSI_ETSIGetPeerList_Handler,
+ },
{
MethodName: "ETSIGetEncryptKeys256Bit",
Handler: _KmsETSI_ETSIGetEncryptKeys256Bit_Handler,
diff --git a/kmsintercomproto/kmsintercom.pb.go b/kmsintercomproto/kmsintercom.pb.go
index 400cd7a3b25cac14474bf76d6470448ac5d4225f..db7290ed7623b17641bc5cf682fd009702b4765b 100644
--- a/kmsintercomproto/kmsintercom.pb.go
+++ b/kmsintercomproto/kmsintercom.pb.go
@@ -124,7 +124,7 @@ type InterComKeyTransportSessionHandlingRequest struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- MyKmsName string `protobuf:"bytes,1,opt,name=myKmsName,proto3" json:"myKmsName,omitempty"`
+ RequestedKey string `protobuf:"bytes,1,opt,name=requestedKey,proto3" json:"requestedKey,omitempty"`
}
func (x *InterComKeyTransportSessionHandlingRequest) Reset() {
@@ -159,9 +159,9 @@ func (*InterComKeyTransportSessionHandlingRequest) Descriptor() ([]byte, []int)
return file_kmsintercom_proto_rawDescGZIP(), []int{2}
}
-func (x *InterComKeyTransportSessionHandlingRequest) GetMyKmsName() string {
+func (x *InterComKeyTransportSessionHandlingRequest) GetRequestedKey() string {
if x != nil {
- return x.MyKmsName
+ return x.RequestedKey
}
return ""
}
@@ -172,7 +172,7 @@ type InterComKeyTransportSessionHandlingReply struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- PeerKmsName string `protobuf:"bytes,1,opt,name=peerKmsName,proto3" json:"peerKmsName,omitempty"`
+ UsedKey string `protobuf:"bytes,1,opt,name=usedKey,proto3" json:"usedKey,omitempty"`
}
func (x *InterComKeyTransportSessionHandlingReply) Reset() {
@@ -207,9 +207,9 @@ func (*InterComKeyTransportSessionHandlingReply) Descriptor() ([]byte, []int) {
return file_kmsintercom_proto_rawDescGZIP(), []int{3}
}
-func (x *InterComKeyTransportSessionHandlingReply) GetPeerKmsName() string {
+func (x *InterComKeyTransportSessionHandlingReply) GetUsedKey() string {
if x != nil {
- return x.PeerKmsName
+ return x.UsedKey
}
return ""
}
@@ -227,39 +227,39 @@ var file_kmsintercom_proto_rawDesc = []byte{
0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
0x20, 0x0a, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d,
- 0x65, 0x22, 0x4a, 0x0a, 0x2a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79,
+ 0x65, 0x22, 0x50, 0x0a, 0x2a, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79,
0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
- 0x1c, 0x0a, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x09, 0x6d, 0x79, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x4c, 0x0a,
- 0x28, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e,
- 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64,
- 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x65, 0x65,
- 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
- 0x70, 0x65, 0x65, 0x72, 0x4b, 0x6d, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0xa5, 0x02, 0x0a, 0x09,
- 0x4b, 0x6d, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x74, 0x0a, 0x14, 0x49, 0x6e, 0x74,
- 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65,
- 0x73, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70,
- 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
- 0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72,
- 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61,
- 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12,
- 0xa1, 0x01, 0x0a, 0x23, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54,
- 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48,
- 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74,
- 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72,
- 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53,
- 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72,
+ 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64,
+ 0x4b, 0x65, 0x79, 0x22, 0x44, 0x0a, 0x28, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b,
+ 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69,
+ 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+ 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x07, 0x75, 0x73, 0x65, 0x64, 0x4b, 0x65, 0x79, 0x32, 0xa5, 0x02, 0x0a, 0x09, 0x4b, 0x6d,
+ 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x74, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x72,
+ 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12,
+ 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62,
+ 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b,
+ 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69,
+ 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0xa1, 0x01,
+ 0x0a, 0x23, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61,
+ 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e,
+ 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72,
0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f,
0x6d, 0x4b, 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73,
- 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c,
- 0x79, 0x22, 0x00, 0x42, 0x3b, 0x5a, 0x39, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e,
- 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65,
- 0x72, 0x6c, 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f,
- 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x73, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75,
+ 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f,
+ 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x4b,
+ 0x65, 0x79, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x65, 0x73, 0x73, 0x69,
+ 0x6f, 0x6e, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22,
+ 0x00, 0x42, 0x3b, 0x5a, 0x39, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d,
+ 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65, 0x72, 0x6c,
+ 0x69, 0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f, 0x6b, 0x6d,
+ 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/kmsintercomproto/kmsintercom.proto b/kmsintercomproto/kmsintercom.proto
index e7123d6074ee2b49446f1d52559c29408ead6b42..9966a634c5e3a8f12c6620db1de6f26b89aa13de 100644
--- a/kmsintercomproto/kmsintercom.proto
+++ b/kmsintercomproto/kmsintercom.proto
@@ -23,11 +23,11 @@ message InterComCapabilitiesReply {
// KeyTransportSessionHandling
// The request message containing the requesting kms' name.
message InterComKeyTransportSessionHandlingRequest {
- string myKmsName = 1;
+ string requestedKey = 1;
}
// The response message containing the replying kms' name.
message InterComKeyTransportSessionHandlingReply {
- string peerKmsName= 1;
+ string usedKey = 1;
}