Add KeyManager interface.

Also move all interfaces to tink folder and subtle files to separate
folders.

Change-Id: Ifcf03863f44c30ee3ee259c707675be557fc167d
ORIGINAL_AUTHOR=Thanh Bui <thanhb@google.com>
GitOrigin-RevId: 509122b9014209ec8537318533dc8bca061fbed5

go/subtle/BUILD

@@ -10,11 +10,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 # hmac subtle
 HMAC_SRCS = [
-    "hmac.go",
+    "hmac/hmac.go",
 ]
 
 HMAC_TEST_SRCS = [
-    "hmac_test.go",
+    "hmac/hmac_test.go",
 ]
 
 go_library(
@@ -26,17 +26,17 @@ go_test(
     name = "hmac_test",
     srcs = HMAC_SRCS + HMAC_TEST_SRCS,
     deps = [
-        "//go:mac_interface",
+        "//go/tink",
     ],
 )
 
 # random
 RANDOM_SRCS = [
-    "random.go",
+    "random/random.go",
 ]
 
 RANDOM_TEST_SRCS = [
-    "random_test.go",
+    "random/random_test.go",
 ]
 
 go_library(

go/subtle/hmac.go → go/subtle/hmac/hmac.go

@@ -19,7 +19,7 @@
 
 //TODO(thaidn): enforce some minimal value for key size and tag size.
 
-package subtle
+package hmac
 
 import (
     "crypto/hmac"

go/subtle/hmac_test.go → go/subtle/hmac/hmac_test.go

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////
-package subtle
+package hmac
 
 import (
     "testing"
     "crypto/sha256"
     "crypto/sha512"
     "encoding/hex"
-    mac "github.com/google/tink/go/mac_interface"
+    "github.com/google/tink/go/tink/tink"
     "fmt"
 )
 
@@ -123,5 +123,5 @@ func TestTooBigTagSize(t *testing.T) {
 
 func testMacInterface(t *testing.T) {
   // This line throws an error if Hmac doesn't implement Mac interface
-  var _ mac.Mac = (*Hmac)(nil)
+  var _ tink.Mac = (*Hmac)(nil)
 }
\ No newline at end of file

go/subtle/random.go → go/subtle/random/random.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////
-package subtle
+package random
 
 import (
     "crypto/rand"

go/subtle/random_test.go → go/subtle/random/random_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 ////////////////////////////////////////////////////////////////////////////////
-package subtle
+package random
 
 import (
     "testing"

go/BUILD → go/tink/BUILD

@@ -6,8 +6,25 @@ package(
 
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
-# Mac interface
+# tink
+TINK_SRCS = [
+    "mac.go",
+    "key_manager.go",
+]
+
+TINK_DEPS = [
+    "//proto:tink_go_proto",
+    "@com_github_golang_protobuf//proto:go_default_library",
+]
+
 go_library(
-    name = "mac_interface",
-    srcs = ["mac.go"],
+    name = "tink",
+    srcs = TINK_SRCS,
+    deps = TINK_DEPS,
+)
+
+go_test(
+    name = "tink_test",
+    srcs = TINK_SRCS,
+    deps = TINK_DEPS,
 )

go/tink/key_manager.go

+// Copyright 2017 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package tink
+
+import (
+    proto "github.com/golang/protobuf/proto"
+    . "github.com/google/tink/proto/tink_go_proto"
+)
+
+/**
+ * KeyManager "understands" keys of a specific key types: it can
+ * generate keys of a supported type and create primitives for
+ * supported keys.  A key type is identified by the global name of the
+ * protocol buffer that holds the corresponding key material, and is
+ * given by type_url-field of KeyData-protocol buffer.
+ */
+type KeyManager interface {
+
+    /**
+     * Constructs a primitive instance for the key given in {@code serializedKey},
+     * which must be a serialized key protocol buffer handled by this manager.
+     *
+     * @return the new constructed primitive instance.
+     */
+    GetPrimitiveFromSerializedKey(serializedKey []byte) (interface{}, error)
+
+    /**
+     * Constructs a primitive instance for the key given in {@code key}.
+     *
+     * @return the new constructed primitive instance.
+     */
+    GetPrimitiveFromKey(key proto.Message) (interface{}, error)
+
+    /**
+     * Generates a new key according to specification in {@code serializedKeyFormat},
+     * which must be a serialized key format protocol buffer handled by this manager.
+     *
+     * @return the new generated key.
+     */
+    NewKeyFromSerializedKeyFormat(serializedKeyFormat []byte) (proto.Message, error)
+
+    /**
+     * Generates a new key according to specification in {@code keyFormat}.
+     *
+     * @return the new generated key.
+     */
+    NewKeyFromKeyFormat(keyFormat proto.Message) (proto.Message, error)
+
+    /**
+     * @return true iff this KeyManager supports key type identified by {@code typeUrl}.
+     */
+    DoesSupport(typeUrl string) bool
+
+    /**
+     * @return the type URL that identifes the key type of keys managed by this KeyManager.
+     */
+    GetKeyType() string
+
+    // APIs for Key Management
+
+    /**
+     * Generates a new {@code KeyData} according to specification in {@code serializedkeyFormat}.
+     * This should be used solely by the key management API.
+     *
+     * @return the new generated key.
+     */
+    NewKeyData(serializedKeyFormat []byte) (*KeyData, error)
+}
\ No newline at end of file