Skip to content

Remove references to key lifetime #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Remove references to key lifetime #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions protobuf/asym_sign.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@
*/
syntax = "proto3";

import "key_attributes.proto";

package asym_sign;

message OpAsymmetricSignProto {
string key_name = 1;
key_attributes.KeyLifetime key_lifetime = 2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

reserved 2;
bytes hash = 3;
}

message ResultAsymmetricSignProto {
bytes signature = 1;
}
}
6 changes: 2 additions & 4 deletions protobuf/asym_verify.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
*/
syntax = "proto3";

import "key_attributes.proto";

package asym_verify;

message OpAsymmetricVerifyProto {
string key_name = 1;
key_attributes.KeyLifetime key_lifetime = 2;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, tags should be in order

reserved 2;
bytes hash = 3;
bytes signature = 4;
}

message ResultAsymmetricVerifyProto { }
message ResultAsymmetricVerifyProto { }
6 changes: 2 additions & 4 deletions protobuf/destroy_key.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
*/
syntax = "proto3";

import "key_attributes.proto";

package destroy_key;

message OpDestroyKeyProto {
string key_name = 1;
key_attributes.KeyLifetime key_lifetime = 2;
reserved 2;
}

message ResultDestroyKeyProto { }
message ResultDestroyKeyProto { }
6 changes: 2 additions & 4 deletions protobuf/export_public_key.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
*/
syntax = "proto3";

import "key_attributes.proto";

package export_public_key;

message OpExportPublicKeyProto {
string key_name = 1;
key_attributes.KeyLifetime key_lifetime = 2;
reserved 2;
}

message ResultExportPublicKeyProto {
bytes key_data = 1;
}
}
9 changes: 2 additions & 7 deletions protobuf/key_attributes.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ syntax = "proto3";

package key_attributes;

enum KeyLifetime {
Volatile = 0;
Persistent = 1;
}

enum KeyType {
HMAC_Key = 0;
Derivation_Key = 1;
Expand Down Expand Up @@ -171,7 +166,7 @@ message KeyAgreement {
}

message KeyAttributesProto {
KeyLifetime key_lifetime = 1;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you pull the tag numbers down to start from 1 again?

reserved 1;
KeyType key_type = 2;
EccCurve ecc_curve = 3;
oneof algorithm_proto {
Expand All @@ -191,4 +186,4 @@ message KeyAttributesProto {
bool permit_sign = 8;
bool permit_verify = 9;
bool permit_derive = 10;
}
}