diff --git a/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go b/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go index 6586db4574081586f6477e5104cec5e027336153..10de0b92156da77a0a0b106548aa0f4016602609 100644 --- a/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go +++ b/internal/api/gen/proto/go/kmsetsi/kmsetsiproto.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc (unknown) // source: kmsetsi/kmsetsiproto.proto diff --git a/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go b/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go index 859f69e96857d236e2728b6eaca40b3139a12e16..42d67c9585840b38b72d024c639f5ee885be3198 100644 --- a/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go +++ b/internal/api/gen/proto/go/kmsintercom/kmsintercom.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.32.0 // protoc (unknown) // source: kmsintercom/kmsintercom.proto @@ -590,6 +590,116 @@ func (x *KeyForwardingResponse) GetTimestamp() int64 { return 0 } +type KeyDeliveryRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + PathId string `protobuf:"bytes,2,opt,name=pathId,proto3" json:"pathId,omitempty"` + Key []*Key `protobuf:"bytes,4,rep,name=key,proto3" json:"key,omitempty"` +} + +func (x *KeyDeliveryRequest) Reset() { + *x = KeyDeliveryRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *KeyDeliveryRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*KeyDeliveryRequest) ProtoMessage() {} + +func (x *KeyDeliveryRequest) ProtoReflect() protoreflect.Message { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[10] + 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 KeyDeliveryRequest.ProtoReflect.Descriptor instead. +func (*KeyDeliveryRequest) Descriptor() ([]byte, []int) { + return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{10} +} + +func (x *KeyDeliveryRequest) GetTimestamp() int64 { + if x != nil { + return x.Timestamp + } + return 0 +} + +func (x *KeyDeliveryRequest) GetPathId() string { + if x != nil { + return x.PathId + } + return "" +} + +func (x *KeyDeliveryRequest) GetKey() []*Key { + if x != nil { + return x.Key + } + return nil +} + +type KeyDeliveryResponse struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` +} + +func (x *KeyDeliveryResponse) Reset() { + *x = KeyDeliveryResponse{} + if protoimpl.UnsafeEnabled { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *KeyDeliveryResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*KeyDeliveryResponse) ProtoMessage() {} + +func (x *KeyDeliveryResponse) ProtoReflect() protoreflect.Message { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[11] + 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 KeyDeliveryResponse.ProtoReflect.Descriptor instead. +func (*KeyDeliveryResponse) Descriptor() ([]byte, []int) { + return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{11} +} + +func (x *KeyDeliveryResponse) GetTimestamp() int64 { + if x != nil { + return x.Timestamp + } + return 0 +} + type KeyIdNotificationRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -603,7 +713,7 @@ type KeyIdNotificationRequest struct { func (x *KeyIdNotificationRequest) Reset() { *x = KeyIdNotificationRequest{} if protoimpl.UnsafeEnabled { - mi := &file_kmsintercom_kmsintercom_proto_msgTypes[10] + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -616,7 +726,7 @@ func (x *KeyIdNotificationRequest) String() string { func (*KeyIdNotificationRequest) ProtoMessage() {} func (x *KeyIdNotificationRequest) ProtoReflect() protoreflect.Message { - mi := &file_kmsintercom_kmsintercom_proto_msgTypes[10] + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -629,7 +739,7 @@ func (x *KeyIdNotificationRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use KeyIdNotificationRequest.ProtoReflect.Descriptor instead. func (*KeyIdNotificationRequest) Descriptor() ([]byte, []int) { - return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{10} + return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{12} } func (x *KeyIdNotificationRequest) GetTimestamp() int64 { @@ -664,7 +774,7 @@ type KeyIdNotificationResponse struct { func (x *KeyIdNotificationResponse) Reset() { *x = KeyIdNotificationResponse{} if protoimpl.UnsafeEnabled { - mi := &file_kmsintercom_kmsintercom_proto_msgTypes[11] + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -677,7 +787,7 @@ func (x *KeyIdNotificationResponse) String() string { func (*KeyIdNotificationResponse) ProtoMessage() {} func (x *KeyIdNotificationResponse) ProtoReflect() protoreflect.Message { - mi := &file_kmsintercom_kmsintercom_proto_msgTypes[11] + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -690,7 +800,7 @@ func (x *KeyIdNotificationResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use KeyIdNotificationResponse.ProtoReflect.Descriptor instead. func (*KeyIdNotificationResponse) Descriptor() ([]byte, []int) { - return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{11} + return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{13} } func (x *KeyIdNotificationResponse) GetTimestamp() int64 { @@ -700,6 +810,61 @@ func (x *KeyIdNotificationResponse) GetTimestamp() int64 { return 0 } +type Key struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` +} + +func (x *Key) Reset() { + *x = Key{} + if protoimpl.UnsafeEnabled { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[14] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Key) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Key) ProtoMessage() {} + +func (x *Key) ProtoReflect() protoreflect.Message { + mi := &file_kmsintercom_kmsintercom_proto_msgTypes[14] + 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 Key.ProtoReflect.Descriptor instead. +func (*Key) Descriptor() ([]byte, []int) { + return file_kmsintercom_kmsintercom_proto_rawDescGZIP(), []int{14} +} + +func (x *Key) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *Key) GetKey() string { + if x != nil { + return x.Key + } + return "" +} + var File_kmsintercom_kmsintercom_proto protoreflect.FileDescriptor var file_kmsintercom_kmsintercom_proto_rawDesc = []byte{ @@ -763,71 +928,89 @@ var file_kmsintercom_kmsintercom_proto_rawDesc = []byte{ 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x74, 0x0a, - 0x18, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x43, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x6b, - 0x65, 0x79, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6b, 0x65, 0x79, - 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x19, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x32, 0x82, - 0x05, 0x0a, 0x09, 0x4b, 0x6d, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x6a, 0x0a, 0x14, - 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x69, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, - 0x6f, 0x6d, 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, 0x26, - 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 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, 0x52, 0x0a, 0x0b, 0x53, 0x79, 0x6e, 0x63, - 0x51, 0x6b, 0x64, 0x42, 0x75, 0x6c, 0x6b, 0x12, 0x1f, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x51, 0x6b, 0x64, 0x42, 0x75, 0x6c, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x51, 0x6b, 0x64, 0x42, 0x75, - 0x6c, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x64, 0x0a, 0x11, - 0x53, 0x79, 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x46, 0x6f, 0x72, 0x42, 0x75, 0x6c, - 0x6b, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, - 0x53, 0x79, 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x46, 0x6f, 0x72, 0x42, 0x75, 0x6c, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, - 0x73, 0x46, 0x6f, 0x72, 0x42, 0x75, 0x6c, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x8e, 0x01, 0x0a, 0x1f, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x54, - 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, 0x4e, 0x65, 0x67, 0x6f, 0x74, - 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x61, + 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x6e, 0x0a, + 0x12, 0x4b, 0x65, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x74, 0x68, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x70, 0x61, 0x74, 0x68, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x33, 0x0a, + 0x13, 0x4b, 0x65, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, + 0x6d, 0x70, 0x22, 0x74, 0x0a, 0x18, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1c, + 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x0a, 0x0c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, + 0x12, 0x16, 0x0a, 0x06, 0x6b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x06, 0x6b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x22, 0x39, 0x0a, 0x19, 0x4b, 0x65, 0x79, 0x49, + 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, + 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, + 0x61, 0x6d, 0x70, 0x22, 0x27, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xd6, 0x05, 0x0a, + 0x09, 0x4b, 0x6d, 0x73, 0x54, 0x61, 0x6c, 0x6b, 0x65, 0x72, 0x12, 0x6a, 0x0a, 0x14, 0x49, 0x6e, + 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, + 0x65, 0x73, 0x12, 0x28, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, + 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, 0x26, 0x2e, 0x6b, + 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 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, 0x52, 0x0a, 0x0b, 0x53, 0x79, 0x6e, 0x63, 0x51, 0x6b, + 0x64, 0x42, 0x75, 0x6c, 0x6b, 0x12, 0x1f, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x51, 0x6b, 0x64, 0x42, 0x75, 0x6c, 0x6b, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x51, 0x6b, 0x64, 0x42, 0x75, 0x6c, 0x6b, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x64, 0x0a, 0x11, 0x53, 0x79, + 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x46, 0x6f, 0x72, 0x42, 0x75, 0x6c, 0x6b, 0x12, + 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, + 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x46, 0x6f, 0x72, 0x42, 0x75, 0x6c, 0x6b, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x73, 0x46, + 0x6f, 0x72, 0x42, 0x75, 0x6c, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x8e, 0x01, 0x0a, 0x1f, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, 0x4e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6b, 0x6d, - 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, - 0x6f, 0x6d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, 0x4e, 0x65, - 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x12, 0x21, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, - 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, - 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x64, 0x0a, - 0x11, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, - 0x2e, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6b, 0x6d, 0x73, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, - 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x42, 0xb7, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6b, 0x6d, 0x73, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x42, 0x10, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x63, 0x6f, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x63, 0x6f, 0x64, - 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, 0x64, 0x65, - 0x6d, 0x6f, 0x71, 0x75, 0x61, 0x6e, 0x64, 0x74, 0x2f, 0x65, 0x6b, 0x6d, 0x73, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6b, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x63, 0x6f, 0x6d, 0xa2, 0x02, 0x03, 0x4b, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4b, 0x6d, 0x73, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0xca, 0x02, 0x0b, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x63, 0x6f, 0x6d, 0xe2, 0x02, 0x17, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x63, 0x6f, 0x6d, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x0b, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, + 0x6f, 0x6d, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x70, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, 0x4e, 0x65, 0x67, 0x6f, 0x74, 0x69, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x6b, 0x6d, 0x73, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, + 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4b, 0x65, 0x79, 0x4e, 0x65, 0x67, 0x6f, + 0x74, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x58, 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, + 0x6e, 0x67, 0x12, 0x21, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, + 0x2e, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x63, 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x64, 0x0a, 0x11, 0x4b, + 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, + 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x52, 0x0a, 0x0b, 0x4b, 0x65, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, + 0x12, 0x1f, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, 0x4b, + 0x65, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x2e, + 0x4b, 0x65, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0xb7, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x6b, 0x6d, + 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x42, 0x10, 0x4b, 0x6d, 0x73, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x46, 0x63, + 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64, 0x61, 0x2e, 0x64, 0x65, 0x2f, + 0x64, 0x65, 0x6d, 0x6f, 0x71, 0x75, 0x61, 0x6e, 0x64, 0x74, 0x2f, 0x65, 0x6b, 0x6d, 0x73, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x6b, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x6b, 0x6d, 0x73, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x63, 0x6f, 0x6d, 0xa2, 0x02, 0x03, 0x4b, 0x58, 0x58, 0xaa, 0x02, 0x0b, 0x4b, 0x6d, + 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0xca, 0x02, 0x0b, 0x4b, 0x6d, 0x73, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0xe2, 0x02, 0x17, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, + 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0xea, 0x02, 0x0b, 0x4b, 0x6d, 0x73, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x6f, 0x6d, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -842,7 +1025,7 @@ func file_kmsintercom_kmsintercom_proto_rawDescGZIP() []byte { return file_kmsintercom_kmsintercom_proto_rawDescData } -var file_kmsintercom_kmsintercom_proto_msgTypes = make([]protoimpl.MessageInfo, 12) +var file_kmsintercom_kmsintercom_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_kmsintercom_kmsintercom_proto_goTypes = []interface{}{ (*InterComCapabilitiesRequest)(nil), // 0: kmsintercom.InterComCapabilitiesRequest (*InterComCapabilitiesReply)(nil), // 1: kmsintercom.InterComCapabilitiesReply @@ -854,27 +1037,33 @@ var file_kmsintercom_kmsintercom_proto_goTypes = []interface{}{ (*InterComTransportKeyNegotiationResponse)(nil), // 7: kmsintercom.InterComTransportKeyNegotiationResponse (*KeyForwardingRequest)(nil), // 8: kmsintercom.KeyForwardingRequest (*KeyForwardingResponse)(nil), // 9: kmsintercom.KeyForwardingResponse - (*KeyIdNotificationRequest)(nil), // 10: kmsintercom.KeyIdNotificationRequest - (*KeyIdNotificationResponse)(nil), // 11: kmsintercom.KeyIdNotificationResponse + (*KeyDeliveryRequest)(nil), // 10: kmsintercom.KeyDeliveryRequest + (*KeyDeliveryResponse)(nil), // 11: kmsintercom.KeyDeliveryResponse + (*KeyIdNotificationRequest)(nil), // 12: kmsintercom.KeyIdNotificationRequest + (*KeyIdNotificationResponse)(nil), // 13: kmsintercom.KeyIdNotificationResponse + (*Key)(nil), // 14: kmsintercom.Key } var file_kmsintercom_kmsintercom_proto_depIdxs = []int32{ - 0, // 0: kmsintercom.KmsTalker.InterComCapabilities:input_type -> kmsintercom.InterComCapabilitiesRequest - 2, // 1: kmsintercom.KmsTalker.SyncQkdBulk:input_type -> kmsintercom.SyncQkdBulkRequest - 3, // 2: kmsintercom.KmsTalker.SyncKeyIdsForBulk:input_type -> kmsintercom.SyncKeyIdsForBulkRequest - 6, // 3: kmsintercom.KmsTalker.InterComTransportKeyNegotiation:input_type -> kmsintercom.InterComTransportKeyNegotiationRequest - 8, // 4: kmsintercom.KmsTalker.KeyForwarding:input_type -> kmsintercom.KeyForwardingRequest - 10, // 5: kmsintercom.KmsTalker.KeyIdNotification:input_type -> kmsintercom.KeyIdNotificationRequest - 1, // 6: kmsintercom.KmsTalker.InterComCapabilities:output_type -> kmsintercom.InterComCapabilitiesReply - 5, // 7: kmsintercom.KmsTalker.SyncQkdBulk:output_type -> kmsintercom.SyncQkdBulkResponse - 4, // 8: kmsintercom.KmsTalker.SyncKeyIdsForBulk:output_type -> kmsintercom.SyncKeyIdsForBulkResponse - 7, // 9: kmsintercom.KmsTalker.InterComTransportKeyNegotiation:output_type -> kmsintercom.InterComTransportKeyNegotiationResponse - 9, // 10: kmsintercom.KmsTalker.KeyForwarding:output_type -> kmsintercom.KeyForwardingResponse - 11, // 11: kmsintercom.KmsTalker.KeyIdNotification:output_type -> kmsintercom.KeyIdNotificationResponse - 6, // [6:12] is the sub-list for method output_type - 0, // [0:6] 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 + 14, // 0: kmsintercom.KeyDeliveryRequest.key:type_name -> kmsintercom.Key + 0, // 1: kmsintercom.KmsTalker.InterComCapabilities:input_type -> kmsintercom.InterComCapabilitiesRequest + 2, // 2: kmsintercom.KmsTalker.SyncQkdBulk:input_type -> kmsintercom.SyncQkdBulkRequest + 3, // 3: kmsintercom.KmsTalker.SyncKeyIdsForBulk:input_type -> kmsintercom.SyncKeyIdsForBulkRequest + 6, // 4: kmsintercom.KmsTalker.InterComTransportKeyNegotiation:input_type -> kmsintercom.InterComTransportKeyNegotiationRequest + 8, // 5: kmsintercom.KmsTalker.KeyForwarding:input_type -> kmsintercom.KeyForwardingRequest + 12, // 6: kmsintercom.KmsTalker.KeyIdNotification:input_type -> kmsintercom.KeyIdNotificationRequest + 10, // 7: kmsintercom.KmsTalker.KeyDelivery:input_type -> kmsintercom.KeyDeliveryRequest + 1, // 8: kmsintercom.KmsTalker.InterComCapabilities:output_type -> kmsintercom.InterComCapabilitiesReply + 5, // 9: kmsintercom.KmsTalker.SyncQkdBulk:output_type -> kmsintercom.SyncQkdBulkResponse + 4, // 10: kmsintercom.KmsTalker.SyncKeyIdsForBulk:output_type -> kmsintercom.SyncKeyIdsForBulkResponse + 7, // 11: kmsintercom.KmsTalker.InterComTransportKeyNegotiation:output_type -> kmsintercom.InterComTransportKeyNegotiationResponse + 9, // 12: kmsintercom.KmsTalker.KeyForwarding:output_type -> kmsintercom.KeyForwardingResponse + 13, // 13: kmsintercom.KmsTalker.KeyIdNotification:output_type -> kmsintercom.KeyIdNotificationResponse + 11, // 14: kmsintercom.KmsTalker.KeyDelivery:output_type -> kmsintercom.KeyDeliveryResponse + 8, // [8:15] is the sub-list for method output_type + 1, // [1:8] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_kmsintercom_kmsintercom_proto_init() } @@ -1004,7 +1193,7 @@ func file_kmsintercom_kmsintercom_proto_init() { } } file_kmsintercom_kmsintercom_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*KeyIdNotificationRequest); i { + switch v := v.(*KeyDeliveryRequest); i { case 0: return &v.state case 1: @@ -1016,6 +1205,30 @@ func file_kmsintercom_kmsintercom_proto_init() { } } file_kmsintercom_kmsintercom_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*KeyDeliveryResponse); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kmsintercom_kmsintercom_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*KeyIdNotificationRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_kmsintercom_kmsintercom_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*KeyIdNotificationResponse); i { case 0: return &v.state @@ -1027,6 +1240,18 @@ func file_kmsintercom_kmsintercom_proto_init() { return nil } } + file_kmsintercom_kmsintercom_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Key); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1034,7 +1259,7 @@ func file_kmsintercom_kmsintercom_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_kmsintercom_kmsintercom_proto_rawDesc, NumEnums: 0, - NumMessages: 12, + NumMessages: 15, NumExtensions: 0, NumServices: 1, }, diff --git a/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go b/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go index 5ae671cc190549cd16de5c9bef5bbe9822623d50..f913de9ac26bfae9bc1d9977cd37ef367fa8ba1e 100644 --- a/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go +++ b/internal/api/gen/proto/go/kmsintercom/kmsintercom_grpc.pb.go @@ -25,6 +25,7 @@ const ( KmsTalker_InterComTransportKeyNegotiation_FullMethodName = "/kmsintercom.KmsTalker/InterComTransportKeyNegotiation" KmsTalker_KeyForwarding_FullMethodName = "/kmsintercom.KmsTalker/KeyForwarding" KmsTalker_KeyIdNotification_FullMethodName = "/kmsintercom.KmsTalker/KeyIdNotification" + KmsTalker_KeyDelivery_FullMethodName = "/kmsintercom.KmsTalker/KeyDelivery" ) // KmsTalkerClient is the client API for KmsTalker service. @@ -38,6 +39,7 @@ type KmsTalkerClient interface { KeyForwarding(ctx context.Context, in *KeyForwardingRequest, opts ...grpc.CallOption) (*KeyForwardingResponse, error) // KeyIDNotification is used for ETSI GS QKD 014 KeyIdNotification(ctx context.Context, in *KeyIdNotificationRequest, opts ...grpc.CallOption) (*KeyIdNotificationResponse, error) + KeyDelivery(ctx context.Context, in *KeyDeliveryRequest, opts ...grpc.CallOption) (*KeyDeliveryResponse, error) } type kmsTalkerClient struct { @@ -102,6 +104,15 @@ func (c *kmsTalkerClient) KeyIdNotification(ctx context.Context, in *KeyIdNotifi return out, nil } +func (c *kmsTalkerClient) KeyDelivery(ctx context.Context, in *KeyDeliveryRequest, opts ...grpc.CallOption) (*KeyDeliveryResponse, error) { + out := new(KeyDeliveryResponse) + err := c.cc.Invoke(ctx, KmsTalker_KeyDelivery_FullMethodName, in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // KmsTalkerServer is the server API for KmsTalker service. // All implementations must embed UnimplementedKmsTalkerServer // for forward compatibility @@ -113,6 +124,7 @@ type KmsTalkerServer interface { KeyForwarding(context.Context, *KeyForwardingRequest) (*KeyForwardingResponse, error) // KeyIDNotification is used for ETSI GS QKD 014 KeyIdNotification(context.Context, *KeyIdNotificationRequest) (*KeyIdNotificationResponse, error) + KeyDelivery(context.Context, *KeyDeliveryRequest) (*KeyDeliveryResponse, error) mustEmbedUnimplementedKmsTalkerServer() } @@ -138,6 +150,9 @@ func (UnimplementedKmsTalkerServer) KeyForwarding(context.Context, *KeyForwardin func (UnimplementedKmsTalkerServer) KeyIdNotification(context.Context, *KeyIdNotificationRequest) (*KeyIdNotificationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method KeyIdNotification not implemented") } +func (UnimplementedKmsTalkerServer) KeyDelivery(context.Context, *KeyDeliveryRequest) (*KeyDeliveryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method KeyDelivery not implemented") +} func (UnimplementedKmsTalkerServer) mustEmbedUnimplementedKmsTalkerServer() {} // UnsafeKmsTalkerServer may be embedded to opt out of forward compatibility for this service. @@ -259,6 +274,24 @@ func _KmsTalker_KeyIdNotification_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +func _KmsTalker_KeyDelivery_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(KeyDeliveryRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(KmsTalkerServer).KeyDelivery(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: KmsTalker_KeyDelivery_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(KmsTalkerServer).KeyDelivery(ctx, req.(*KeyDeliveryRequest)) + } + return interceptor(ctx, in, info, handler) +} + // KmsTalker_ServiceDesc is the grpc.ServiceDesc for KmsTalker service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -290,6 +323,10 @@ var KmsTalker_ServiceDesc = grpc.ServiceDesc{ MethodName: "KeyIdNotification", Handler: _KmsTalker_KeyIdNotification_Handler, }, + { + MethodName: "KeyDelivery", + Handler: _KmsTalker_KeyDelivery_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "kmsintercom/kmsintercom.proto", diff --git a/internal/api/kmsintercom/kmsintercom/kmsintercom.proto b/internal/api/kmsintercom/kmsintercom/kmsintercom.proto index 845742ad9d188953b8b839fe11b70038e4dcbbf8..34132303e17d8b28f9ec42e0404b73a459f2a5f6 100644 --- a/internal/api/kmsintercom/kmsintercom/kmsintercom.proto +++ b/internal/api/kmsintercom/kmsintercom/kmsintercom.proto @@ -11,6 +11,7 @@ service KmsTalker { rpc KeyForwarding(KeyForwardingRequest) returns (KeyForwardingResponse) {} // KeyIDNotification is used for ETSI GS QKD 014 rpc KeyIdNotification(KeyIdNotificationRequest) returns (KeyIdNotificationResponse) {} + rpc KeyDelivery(KeyDeliveryRequest) returns (KeyDeliveryResponse) {} } // Capabilities @@ -70,6 +71,16 @@ message KeyForwardingResponse { int64 timestamp = 1; } +message KeyDeliveryRequest { + int64 timestamp = 1; + string pathId = 2; + repeated Key key = 4; +} + +message KeyDeliveryResponse { + int64 timestamp = 1; +} + message KeyIdNotificationRequest { int64 timestamp = 1; string interComAddr = 2; @@ -79,3 +90,8 @@ message KeyIdNotificationRequest { message KeyIdNotificationResponse { int64 timestamp = 1; } + +message Key { + string id = 1; + string key = 2; +} diff --git a/internal/kms/crypto.go b/internal/kms/crypto/crypto.go similarity index 94% rename from internal/kms/crypto.go rename to internal/kms/crypto/crypto.go index c4fb91cdd196f9f777cce8bbb854ebdd99a9aae8..5103deda77db01bcf7ba7f33ebde6cf203632848 100644 --- a/internal/kms/crypto.go +++ b/internal/kms/crypto/crypto.go @@ -1,4 +1,4 @@ -package kms +package crypto import ( "crypto/aes" @@ -8,14 +8,13 @@ import ( "io" ) -type CryptoAlgorithm interface { +type Algorithm interface { Encrypt(plaintext []byte, key []byte) ([]byte, error) Decrypt(ciphertext []byte, key []byte) ([]byte, error) } // AES. -type AES struct { -} +type AES struct{} func NewAES() *AES { return &AES{} diff --git a/internal/kms/crypto/util.go b/internal/kms/crypto/util.go new file mode 100644 index 0000000000000000000000000000000000000000..b8dc5fc28f75fc6fafbb378ce695cfefc61659ff --- /dev/null +++ b/internal/kms/crypto/util.go @@ -0,0 +1,12 @@ +package crypto + +import "crypto/rand" + +func Random256Bit() ([]byte, error) { + b := make([]byte, 32) + _, err := rand.Read(b) + if err != nil { + return nil, err + } + return b, nil +} diff --git a/internal/kms/kms-keystore.go b/internal/kms/kms-keystore.go index 466d1ea62c351cb86a6402c94bf99214a41ead2a..48cebc8de371fe1262db229a5b173ad8fba4abaa 100644 --- a/internal/kms/kms-keystore.go +++ b/internal/kms/kms-keystore.go @@ -90,6 +90,6 @@ func (ks *kmsKeyStore) GetKeyWithID(id uuid.UUID) (*kmsKSElement, error) { func (ks *kmsKeyStore) DeleteKey(keyId uuid.UUID) { ks.keyStoreMutex.Lock() + defer ks.keyStoreMutex.Unlock() delete(ks.keyStore, keyId) - ks.keyStoreMutex.Unlock() } diff --git a/internal/kms/kms.go b/internal/kms/kms.go index 86cc72e4c6e465caa604dd6edc1ce3d6f91d54ca..43d672ab9bdd96e26ff09c037e245c6c78bd0d75 100644 --- a/internal/kms/kms.go +++ b/internal/kms/kms.go @@ -145,7 +145,7 @@ func (kms *EKMS) AddQuantumElement(qm QuantumModule) error { } func (kms *EKMS) AddPeer(peerKmsId string, kmsPeerSocket string, servingQLE QuantumModule) (*kmsPeer, error) { - //check if peer exists + // check if peer exists if _, there := kms.KmsPeers[kmsPeerSocket]; there { log.Errorf("Trying to add existing peer %s", kmsPeerSocket) return nil, fmt.Errorf("Trying to add existing peer %s", kmsPeerSocket) @@ -160,7 +160,7 @@ func (kms *EKMS) AddPeer(peerKmsId string, kmsPeerSocket string, servingQLE Quan kms.KmsPeers[kmsPeerSocket] = peer kms.kmsPeersMutex.Unlock() - //go peer.PeerHandler(kms.kmsName) + // go peer.PeerHandler(kms.kmsName) return peer, nil } @@ -210,7 +210,7 @@ func (kms *EKMS) EventBus() *event.EventBus { // TODO/XXX error handling func (kms *EKMS) RemovePeer(kmsPeerSocket string) { if _, there := kms.KmsPeers[kmsPeerSocket]; there { - //peer.quit <- true + // peer.quit <- true delete(kms.KmsPeers, kmsPeerSocket) return } diff --git a/internal/kms/kmsintercom.go b/internal/kms/kmsintercom.go index dfe4161d78778089bd08df89520cff06f14e833f..616dfdc414495c8cb57f3497bb4b5ec8d264c139 100644 --- a/internal/kms/kmsintercom.go +++ b/internal/kms/kmsintercom.go @@ -11,6 +11,7 @@ import ( etsi14 "code.fbi.h-da.de/danet/ekms/api/go/rest/etsi/client" pb "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom" + "code.fbi.h-da.de/danet/ekms/internal/kms/crypto" "code.fbi.h-da.de/danet/ekms/internal/kms/event" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -40,7 +41,7 @@ func (s *kmsTalkerServer) KeyIdNotification(ctx context.Context, in *pb.KeyIdNot // check if a peer exists peer, ok := s.eKMS.KmsPeers[in.GetInterComAddr()] if !ok { - //TODO: proper error message + // TODO: proper error message return nil, status.Error(codes.Internal, "peer does not exist") } @@ -90,7 +91,7 @@ func (s *kmsTalkerServer) SyncQkdBulk(ctx context.Context, in *pb.SyncQkdBulkReq // check if a peer exists peer, ok := s.eKMS.KmsPeers[in.GetInterComAddr()] if !ok { - //TODO: proper error message + // TODO: proper error message return nil, status.Errorf(codes.Internal, "peer does not exist") } @@ -229,6 +230,14 @@ func (s *kmsTalkerServer) KeyForwarding(ctx context.Context, in *pb.KeyForwardin log.Infof("%s forwards payload to : %s", s.eKMS.kmsName, route.Next.tcpSocketStr) go route.Next.SendPayload(decryptedPayload, pathId) } else { + // NOTE: generate key + _, err := crypto.Random256Bit() + if err != nil { + return nil, status.Errorf(codes.Internal, "%s", err) + } + + // TODO: deliver key + log.Infof("%s received the final payload: %s", s.eKMS.kmsName, string(decryptedPayload)) } diff --git a/internal/kms/kmspeers.go b/internal/kms/kmspeers.go index 301c0aec6839f9922c46e2fa6b8af18de6f705a8..df4f302f40be919122c9a5ea1e13252dc71703f0 100644 --- a/internal/kms/kmspeers.go +++ b/internal/kms/kmspeers.go @@ -8,6 +8,7 @@ import ( "time" pbIC "code.fbi.h-da.de/danet/ekms/internal/api/gen/proto/go/kmsintercom" + "code.fbi.h-da.de/danet/ekms/internal/kms/crypto" "code.fbi.h-da.de/danet/ekms/internal/kms/event" "github.com/google/uuid" log "github.com/sirupsen/logrus" @@ -32,14 +33,18 @@ type kmsPeerInfo interface { } type kmsPeer struct { - peerClient pbIC.KmsTalkerClient - peerStatus KmsPeerStatus - peerKmsId uuid.UUID // NOTE: might be changed in the future - interComAddr string + // NOTE It could be a good idea to turn client and status into its own + // struct (and additional information) e.g. a link + // We need multiple peer clients! + peerClient pbIC.KmsTalkerClient + peerStatus KmsPeerStatus + peerKmsId uuid.UUID // NOTE: might be changed in the future + interComAddr string + // NOTE a peer could have multiple quantum modules servingQuantumModul QuantumModule tcpSocket *net.TCPAddr // the IP address and TCP port (aka socket) of the kms peer tcpSocketStr string // string rep. of tcpSocket - et CryptoAlgorithm + et crypto.Algorithm name string // the name of the kms peer id uuid.UUID // uuid of the peer quit chan bool // cancel the peer goroutine @@ -78,7 +83,7 @@ func NewKmsPeer(peerKmsId string, servQM QuantumModule, tcpSocketStr string, int servingQuantumModul: servQM, tcpSocket: tcpSocket, tcpSocketStr: tcpSocketStr, - et: NewAES(), + et: crypto.NewAES(), id: uuid.New(), quit: make(chan bool), eventBus: eventBus, @@ -109,8 +114,8 @@ func (ph *kmsPeer) SyncBulkKeys() error { // the peer KMS. The key that was agreed upon, is used to create a encrypted // payload. func (ph *kmsPeer) TransportKeyNegotiation() error { - //ctx, cancel := context.WithTimeout(context.Background(), time.Second) - //req, err := ph.peerClient.InterComTransportKeyNegotiation() + // ctx, cancel := context.WithTimeout(context.Background(), time.Second) + // req, err := ph.peerClient.InterComTransportKeyNegotiation() return nil } diff --git a/internal/kms/module.go b/internal/kms/module.go index 93b91d7d4a4ded05560a1a64117feff0a8b509a1..8471b8f8ddcaa960645f44bad5bd87ba937aa5c1 100644 --- a/internal/kms/module.go +++ b/internal/kms/module.go @@ -33,8 +33,8 @@ type QuantumModule interface { type EmulatedQuantumModule struct { QlID uuid.UUID - //QuantumElementLink *quantumlayer.QuantumlayerEmuPRNG // contains information about the quantum links - //key stores of unchopped bulk keys go here + // QuantumElementLink *quantumlayer.QuantumlayerEmuPRNG // contains information about the quantum links + // key stores of unchopped bulk keys go here addr string rawBulkKeysMutex sync.Mutex rawBulkKeys map[int64]*quantumlayer.QuantumLayerBulkKey @@ -45,7 +45,7 @@ type EmulatedQuantumModule struct { func NewEmulatedQuantumModule(kmsUDPAddr string) *EmulatedQuantumModule { return &EmulatedQuantumModule{ QlID: uuid.New(), - //QuantumElementLink: ql, + // QuantumElementLink: ql, addr: kmsUDPAddr, rawBulkKeys: make(map[int64]*quantumlayer.QuantumLayerBulkKey), keyStore: NewKmsKeyStore(256), @@ -59,7 +59,7 @@ func (eqe *EmulatedQuantumModule) ID() uuid.UUID { func (eqe *EmulatedQuantumModule) Initialize() error { // TODO: error handling - //go eqe.keyHandler() + // go eqe.keyHandler() return nil } diff --git a/internal/kms/quipsec.go b/internal/kms/quipsec.go index afc82aecf78e2f72191b5f90ecbacfbd4220c7bf..befe68186137fb9cac221b83df5d1322a5d676a9 100644 --- a/internal/kms/quipsec.go +++ b/internal/kms/quipsec.go @@ -25,6 +25,8 @@ func (qs *quipSecServer) PushKeys(ctx context.Context, req *pb.PushKeysRequest) if err != nil { } + // TODO: qm.address is used as key for map. could be + // used here to directly access. for _, qm := range qs.eKMS.quantumModules { if qm.Address() == host { eqm, ok := qm.(*EmulatedQuantumModule) diff --git a/models/danet/temp.yang b/models/danet/temp.yang index 92c15cf475c2ad52016e38d762887a557fc59451..5ea138185987cbd847c0c112fa4eaae159187043 100644 --- a/models/danet/temp.yang +++ b/models/danet/temp.yang @@ -68,6 +68,8 @@ module temp { // fix module and file name grouping key-properties { description "TBD"; + + // NOTE: reference for the must use quantum module } // key-store @@ -86,10 +88,11 @@ module temp { // fix module and file name "Name of the used inter-KMS-Protocol."; } - leaf op-status { + // name? + leaf admin-status { type enumeration { enum ALLOWED; - enum DISALLOWED; + enum FORBIDDEN; } description @@ -134,7 +137,7 @@ module temp { // fix module and file name leaf node-id { type danet-qkdn-comm:id; description - "Id of the node."; + "ID of the node."; } leaf ip-address { @@ -146,6 +149,7 @@ module temp { // fix module and file name } } + // NOTE: Maybe we want something like multiple links for that specific peer grouping kms-peer { description "Another KMS connected to this KMS."; @@ -178,13 +182,14 @@ module temp { // fix module and file name config false; description - "Id of the QKD module connected to the peer."; + "ID of the QKD module connected to the peer."; } leaf op-status { type enumeration { enum PENDING; - enum ACTIVE; + enum ESTABLISHED; + enum DOWN; enum ERROR; } config false; @@ -201,7 +206,7 @@ module temp { // fix module and file name "The key length negotiated between the two KMS in bits."; } - // add: + // relevant???: // - was this peer known or did it just appear? maybe sth like status field for this (known, unknown) // - administrative status: can I talk with this peer/am I allowed to talk to this peer? } @@ -211,7 +216,7 @@ module temp { // fix module and file name description "Definition of an interface inside of the KMS."; - leaf ip-address { + leaf ip-address { type inet:ipv4-address; } @@ -219,11 +224,6 @@ module temp { // fix module and file name type inet:port-number; } - container inter-kms-protocol { - uses danet-qkdn-comm:inter-kms-protocol; - config false; - } - leaf index { type int16; description @@ -263,7 +263,7 @@ module temp { // fix module and file name leaf path-id { type danet-qkdn-comm:id; description - "Id that is connected to one calculated path through the network and is used as a + "ID that is connected to one calculated path through the network and is used as a reference during the forwarding process."; } @@ -307,6 +307,7 @@ module temp { // fix module and file name "A list of available protocols for communication with other KMS."; } + // NOTE: Could be useful to add something like: QKD-Module-Information leaf-list qkd-module-protocols { type danet-qkdn-comm:qkd-protocol; config false; @@ -377,10 +378,14 @@ module temp { // fix module and file name "The amount of keys forwarded since establishing the route."; } - leaf op-status { // maybe add more like: down, peer unavailable, specific kind of issue, etc. + // NOTE: This is difficult to handle, since we have two endings for + // one routing session that can effect the operation status + // (previous and next). + leaf op-status { type enumeration { enum PENDING; enum ESTABLISHED; + enum DOWN; enum ERROR; } @@ -403,6 +408,7 @@ module temp { // fix module and file name uses danet-qkdn-comm:key-properties; } + // UUID for now, maybe change after discussions leaf remote-ukms-id { type danet-qkdn-comm:id; description