Merge "Remove google.protobuf.Timestamp dependency."

ORIGINAL_AUTHOR=Thai Duong <[email protected]> GitOrigin-RevId: 84da9a74c54bcf0b2c541ffdcd7f4d23ea5b709a
semtle · May 12, 2017 · b55254e · b55254e
1 parent 458d278
commit b55254e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 57 deletions.
diff --git a/java/src/main/java/com/google/cloud/crypto/tink/Util.java b/java/src/main/java/com/google/cloud/crypto/tink/Util.java
@@ -62,8 +62,6 @@ public static KeysetInfo.KeyInfo getKeyInfo(Keyset.Key key) {
         .setStatus(key.getStatus())
         .setOutputPrefixType(key.getOutputPrefixType())
         .setKeyId(key.getKeyId())
-        .setGeneratedAt(key.getGeneratedAt())
-        .setValidUntil(key.getValidUntil())
         .build();
   }
 

diff --git a/proto/BUILD b/proto/BUILD
@@ -38,12 +38,8 @@ java_proto_library(
 # tink
 cc_proto_library(
     name = "tink_cc_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
     inputs = [
         ":common_cc_proto",
-        "@com_github_google_protobuf//:well_known_protos",
     ],
     protos = [
         "tink.proto",
@@ -53,12 +49,8 @@ cc_proto_library(
 
 java_lite_proto_library(
     name = "tink_java_proto_lite",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
     inputs = [
         ":common_java_proto_lite",
-        "@com_github_google_protobuf//:well_known_protos",
     ],
     protos = [
         "tink.proto",
@@ -68,12 +60,8 @@ java_lite_proto_library(
 
 java_proto_library(
     name = "tink_java_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
     inputs = [
         ":common_java_proto",
-        "@com_github_google_protobuf//:well_known_protos",
     ],
     protos = [
         "tink.proto",
@@ -292,12 +280,6 @@ java_proto_library(
 # kms_envelope
 cc_proto_library(
     name = "kms_envelope_cc_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
-    inputs = [
-        "@com_github_google_protobuf//:well_known_protos",
-    ],
     proto_deps = [
         ":tink_cc_proto",
     ],
@@ -309,12 +291,6 @@ cc_proto_library(
 
 java_lite_proto_library(
     name = "kms_envelope_java_proto_lite",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
-    inputs = [
-        "@com_github_google_protobuf//:well_known_protos",
-    ],
     proto_deps = [
         ":tink_java_proto_lite",
     ],
@@ -326,12 +302,6 @@ java_lite_proto_library(
 
 java_proto_library(
     name = "kms_envelope_java_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
-    inputs = [
-        "@com_github_google_protobuf//:well_known_protos",
-    ],
     proto_deps = [
         ":tink_java_proto",
     ],
@@ -344,12 +314,6 @@ java_proto_library(
 # ECIES hybrid encryption with AEAD and HKDF
 cc_proto_library(
     name = "ecies_aead_hkdf_cc_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
-    inputs = [
-        "@com_github_google_protobuf//:well_known_protos",
-    ],
     proto_deps = [
         ":common_cc_proto",
         ":tink_cc_proto",
@@ -362,9 +326,6 @@ cc_proto_library(
 
 java_lite_proto_library(
     name = "ecies_aead_hkdf_java_proto_lite",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
     proto_deps = [
         ":common_java_proto_lite",
         ":tink_java_proto_lite",
@@ -377,9 +338,6 @@ java_lite_proto_library(
 
 java_proto_library(
     name = "ecies_aead_hkdf_java_proto",
-    imports = [
-        "external/com_github_google_protobuf/src/",
-    ],
     proto_deps = [
         ":common_java_proto",
         ":tink_java_proto",

diff --git a/proto/tink.proto b/proto/tink.proto
@@ -19,8 +19,6 @@ syntax = "proto3";
 
 package google.cloud.crypto.tink;
 
-import "google/protobuf/timestamp.proto";
-
 option java_package = "com.google.cloud.crypto.tink";
 option java_outer_classname = "TinkProto";
 
@@ -130,11 +128,6 @@ message Keyset {
     int32 key_id = 3;
 
     OutputPrefixType output_prefix_type = 4;
-
-    // Optional fields, used by key management tools, but not used
-    // by actual cryptographic operations.
-    google.protobuf.Timestamp generated_at = 101;
-    google.protobuf.Timestamp valid_until = 102;
   }
 
   // Identifies key used to generate new crypto data (encrypt, sign).
@@ -163,12 +156,6 @@ message KeysetInfo {
 
     // See Keyset.Key.output_prefix_type.
     OutputPrefixType output_prefix_type = 4;
-
-    // See Keyset.Key.generated_at.
-    google.protobuf.Timestamp generated_at = 101;
-
-    // See Keyset.Key.valid_until.
-    google.protobuf.Timestamp valid_until = 102;
   }
 
   // See Keyset.primary_key_id.