NIAP: Add keystore.proto for java layer usage.
Add keystore.proto for java layer usage.
Bug: 148758680
Test: m
Change-Id: I8fecbcdc46eb12336c9fd1fa1e2166df80d80f19
Merged-In: I8fecbcdc46eb12336c9fd1fa1e2166df80d80f19
diff --git a/system/gd/proto/Android.bp b/system/gd/proto/Android.bp
index ea3620d..b7bfdab 100644
--- a/system/gd/proto/Android.bp
+++ b/system/gd/proto/Android.bp
@@ -4,7 +4,10 @@
proto: {
type: "lite",
},
- srcs: ["bluetooth/metrics/bluetooth.proto"],
+ srcs: [
+ "bluetooth/metrics/bluetooth.proto",
+ "bluetooth/bluetoothKeystore/keystore.proto",
+ ],
}
cc_library_static {
@@ -14,7 +17,10 @@
export_proto_headers: true,
type: "lite",
},
- srcs: ["bluetooth/metrics/bluetooth.proto"],
+ srcs: [
+ "bluetooth/metrics/bluetooth.proto",
+ "bluetooth/bluetoothKeystore/keystore.proto",
+ ],
}
cc_library_static {
@@ -27,7 +33,8 @@
},
srcs: [
"bluetooth/dumpmod.proto",
- "bluetooth/metrics/bluetooth.proto"
+ "bluetooth/metrics/bluetooth.proto",
+ "bluetooth/bluetoothKeystore/keystore.proto",
],
apex_available: [
"//apex_available:platform",
diff --git a/system/gd/proto/bluetooth/bluetoothKeystore/keystore.proto b/system/gd/proto/bluetooth/bluetoothKeystore/keystore.proto
new file mode 100644
index 0000000..7beef96
--- /dev/null
+++ b/system/gd/proto/bluetooth/bluetoothKeystore/keystore.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * 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.
+ */
+
+syntax = "proto2";
+
+option optimize_for = LITE_RUNTIME;
+
+// C++ namespace: bluetooth::metrics::BluetoothMetricsProto
+package bluetooth.keystore.BluetoothKeystoreProto;
+
+option java_package = "com.android.bluetooth";
+option java_outer_classname = "BluetoothKeystoreProto";
+
+// Holds encrypted, authenticated data.
+message EncryptedData {
+ // The initialization vector used during encryption.
+ optional bytes init_vector = 1;
+ // MAC of (init_vector + encrypted_data).
+ optional bytes authentication_data = 2;
+ optional bytes encrypted_data = 3;
+}
