Skip to content
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

Jump to bottom

Use new crypto directory #4723

Merged
merged 4 commits into from
Feb 3, 2024
Merged

Use new crypto directory #4723

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f2a19f
Use new crypto directory
ipetr0v Jan 26, 2024
31ab58a
Update
ipetr0v Jan 26, 2024
2ed32b3
Update
ipetr0v Jan 30, 2024
c537fa0
Update
ipetr0v Jan 30, 2024
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
Next Next commit
Use new crypto directory
  • Loading branch information
@ipetr0v
ipetr0v committed Jan 26, 2024
commit 5f2a19f7abcb03666c5d714cd9ba24917204a6c8
2 changes: 1 addition & 1 deletion cc/client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cc_library(
"//cc/crypto:common",
"//cc/remote_attestation:attestation_verifier",
"//cc/transport",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"//proto/session:messages_cc_proto",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/status:statusor",
Expand Down
2 changes: 1 addition & 1 deletion cc/client/client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "absl/strings/string_view.h"
#include "cc/crypto/client_encryptor.h"
#include "cc/crypto/common.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/session/messages.pb.h"

namespace oak::client {
Expand Down
4 changes: 2 additions & 2 deletions cc/containers/hello_world_trusted_app/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ cc_library(
"//cc/crypto:server_encryptor",
"//oak_containers_hello_world_trusted_app/proto:interface_cc_grpc",
"//oak_containers_hello_world_trusted_app/proto:interface_cc_proto",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@com_github_grpc_grpc//:grpc++",
"@com_google_absl//absl/strings",
],
Expand All @@ -45,7 +45,7 @@ cc_library(
"//cc/crypto/hpke:recipient_context",
"//oak_containers/proto:interfaces_cc_grpc",
"//oak_containers/proto:interfaces_cc_proto",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"//proto/containers:orchestrator_crypto_cc_grpc",
"//proto/containers:orchestrator_crypto_cc_proto",
"@com_github_grpc_grpc//:grpc++",
Expand Down
2 changes: 1 addition & 1 deletion cc/containers/hello_world_trusted_app/app_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "grpcpp/support/status.h"
#include "oak_containers_hello_world_trusted_app/proto/interface.grpc.pb.h"
#include "oak_containers_hello_world_trusted_app/proto/interface.pb.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"

namespace oak::oak_containers_hello_world_trusted_app {

Expand Down
2 changes: 1 addition & 1 deletion cc/containers/hello_world_trusted_app/orchestrator_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "grpcpp/support/status.h"
#include "oak_containers/proto/interfaces.grpc.pb.h"
#include "oak_containers/proto/interfaces.pb.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/containers/orchestrator_crypto.grpc.pb.h"
#include "proto/containers/orchestrator_crypto.pb.h"

Expand Down
2 changes: 1 addition & 1 deletion cc/containers/hello_world_trusted_app/orchestrator_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "cc/crypto/hpke/recipient_context.h"
#include "grpcpp/channel.h"
#include "oak_containers/proto/interfaces.grpc.pb.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/containers/orchestrator_crypto.grpc.pb.h"

namespace oak::oak_containers_hello_world_trusted_app {
Expand Down
6 changes: 3 additions & 3 deletions cc/crypto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cc_library(
":common",
"//cc/crypto/hpke:sender_context",
"//cc/crypto/hpke:utils",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
],
Expand All @@ -42,7 +42,7 @@ cc_library(
":encryption_key",
"//cc/crypto/hpke:recipient_context",
"//cc/crypto/hpke:utils",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand All @@ -56,7 +56,7 @@ cc_library(
deps = [
":common",
"//cc/crypto/hpke:recipient_context",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
],
Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/client_encryptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "cc/crypto/common.h"
#include "cc/crypto/hpke/sender_context.h"
#include "cc/crypto/hpke/utils.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"

namespace oak::crypto {

Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/client_encryptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "absl/strings/string_view.h"
#include "cc/crypto/common.h"
#include "cc/crypto/hpke/sender_context.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"

namespace oak::crypto {

Expand Down
4 changes: 2 additions & 2 deletions cc/crypto/hpke/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ cc_library(
hdrs = ["recipient_context.h"],
deps = [
":utils",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@boringssl//:crypto",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
Expand Down Expand Up @@ -71,7 +71,7 @@ cc_test(
":recipient_context",
":sender_context",
"//cc/crypto/hpke:utils",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"@boringssl//:crypto",
"@com_google_absl//absl/status:statusor",
"@com_google_googletest//:gtest_main",
Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/hpke/recipient_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "cc/crypto/hpke/utils.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "openssl/hpke.h"

namespace oak::crypto {
Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/hpke/recipient_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "openssl/hpke.h"

namespace oak::crypto {
Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/hpke/recipient_context_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "cc/crypto/hpke/utils.h"
#include "gmock/gmock.h"
#include "gtest/gtest.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "openssl/hpke.h"

namespace oak::crypto {
Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/server_encryptor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "cc/crypto/common.h"
#include "cc/crypto/hpke/recipient_context.h"
#include "cc/crypto/hpke/utils.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"

namespace oak::crypto {

Expand Down
2 changes: 1 addition & 1 deletion cc/crypto/server_encryptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "cc/crypto/common.h"
#include "cc/crypto/encryption_key.h"
#include "cc/crypto/hpke/recipient_context.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"

namespace oak::crypto {

Expand Down
6 changes: 3 additions & 3 deletions cc/transport/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cc_library(
name = "transport",
hdrs = ["transport.h"],
deps = [
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"//proto/session:messages_cc_proto",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand All @@ -36,7 +36,7 @@ cc_library(
hdrs = ["grpc_streaming_transport.h"],
deps = [
":transport",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"//proto/session:messages_cc_proto",
"//proto/session:service_streaming_cc_grpc",
"//proto/session:service_streaming_cc_proto",
Expand All @@ -53,7 +53,7 @@ cc_test(
srcs = ["grpc_streaming_transport_test.cc"],
deps = [
":grpc_streaming_transport",
"//oak_crypto/proto/v1:crypto_cc_proto",
"//proto/crypto:crypto_cc_proto",
"//proto/session:messages_cc_proto",
"//proto/session:service_streaming_cc_grpc",
"//proto/session:service_streaming_cc_proto",
Expand Down
2 changes: 1 addition & 1 deletion cc/transport/grpc_streaming_transport.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "grpcpp/client_context.h"
#include "grpcpp/create_channel.h"
#include "grpcpp/grpcpp.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/session/messages.pb.h"

namespace oak::transport {
Expand Down
2 changes: 1 addition & 1 deletion cc/transport/grpc_streaming_transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "cc/transport/transport.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/session/messages.pb.h"
#include "proto/session/service_streaming.grpc.pb.h"
#include "proto/session/service_streaming.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/transport/grpc_streaming_transport_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "grpcpp/server_builder.h"
#include "grpcpp/support/time.h"
#include "gtest/gtest.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/session/messages.pb.h"
#include "proto/session/service_streaming.grpc.pb.h"
#include "proto/session/service_streaming.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion cc/transport/transport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "absl/status/statusor.h"
#include "absl/strings/string_view.h"
#include "oak_crypto/proto/v1/crypto.pb.h"
#include "proto/crypto/crypto.pb.h"
#include "proto/session/messages.pb.h"

namespace oak::transport {
Expand Down
6 changes: 3 additions & 3 deletions java/src/main/java/com/google/oak/crypto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ java_library(
":decryption_result",
"//java/src/main/java/com/google/oak/crypto/hpke",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"@com_google_protobuf//java/core",
],
)
Expand All @@ -52,7 +52,7 @@ java_library(
":decryption_result",
"//java/src/main/java/com/google/oak/crypto/hpke:hpke_android",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"@com_google_protobuf//java/lite",
],
)
Expand All @@ -66,7 +66,7 @@ java_library(
":decryption_result",
"//java/src/main/java/com/google/oak/crypto/hpke",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"@com_google_protobuf//java/core",
],
)
2 changes: 1 addition & 1 deletion java/src/main/java/com/google/oak/server/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ java_library(
"//java/src/main/java/com/google/oak/crypto/hpke",
"//java/src/main/java/com/google/oak/transport",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"//proto/session:service_streaming_java_proto",
"@com_google_guava_guava",
Expand Down
8 changes: 4 additions & 4 deletions java/src/main/java/com/google/oak/transport/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ java_library(
],
deps = [
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"@io_grpc_grpc_java//api",
"@io_grpc_grpc_java//stub",
Expand All @@ -46,7 +46,7 @@ java_library(
],
deps = [
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"@io_grpc_grpc_java//api",
"@io_grpc_grpc_java//stub",
Expand All @@ -61,7 +61,7 @@ java_library(
deps = [
":transport",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"//proto/session:service_streaming_java_proto",
"@io_grpc_grpc_java//stub",
Expand All @@ -76,7 +76,7 @@ java_library(
deps = [
":transport_android",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"//proto/session:service_streaming_java_proto",
"@io_grpc_grpc_java//stub",
Expand Down
2 changes: 1 addition & 1 deletion java/src/test/java/com/google/oak/client/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ java_test(
"//java/src/main/java/com/google/oak/remote_attestation:insecure_attestation_verifier",
"//java/src/main/java/com/google/oak/transport",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"@com_google_protobuf//:protobuf_javalite",
],
Expand Down
2 changes: 1 addition & 1 deletion java/src/test/java/com/google/oak/crypto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ java_test(
"//java/src/main/java/com/google/oak/crypto:server_encryptor",
"//java/src/main/java/com/google/oak/crypto/hpke",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
],
)
2 changes: 1 addition & 1 deletion java/src/test/java/com/google/oak/transport/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ java_test(
deps = [
"//java/src/main/java/com/google/oak/transport:grpc_streaming_transport",
"//java/src/main/java/com/google/oak/util",
"//oak_crypto/proto/v1:crypto_java_proto",
"//proto/crypto:crypto_java_proto",
"//proto/session:messages_java_proto",
"//proto/session:service_streaming_java_grpc",
"//proto/session:service_streaming_java_proto",
Expand Down
2 changes: 1 addition & 1 deletion oak_containers/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ proto_library(
name = "interfaces_proto",
srcs = ["interfaces.proto"],
deps = [
"//oak_crypto/proto/v1:crypto_proto",
"//proto/crypto:crypto_proto",
"//proto/attestation:endorsement_proto",
"//proto/attestation:evidence_proto",
"//proto/session:messages_proto",
Expand Down
2 changes: 1 addition & 1 deletion oak_containers/proto/interfaces.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ syntax = "proto3";
package oak.containers;

import "google/protobuf/empty.proto";
import "oak_crypto/proto/v1/crypto.proto";
import "proto/crypto/crypto.proto";
import "proto/attestation/endorsement.proto";
import "proto/attestation/evidence.proto";
import "proto/session/messages.proto";
Expand Down
2 changes: 1 addition & 1 deletion oak_containers_hello_world_trusted_app/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
generate_grpc_code(
&[
"../oak_containers_hello_world_trusted_app/proto/interface.proto",
"../oak_crypto/proto/v1/crypto.proto",
"../proto/crypto/crypto.proto",
],
"..",
CodegenOptions {
Expand Down
2 changes: 1 addition & 1 deletion oak_containers_hello_world_trusted_app/proto/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ proto_library(
name = "interface_proto",
srcs = ["interface.proto"],
deps = [
"//oak_crypto/proto/v1:crypto_proto",
"//proto/crypto:crypto_proto",
],
)

Expand Down
2 changes: 1 addition & 1 deletion oak_containers_hello_world_trusted_app/proto/interface.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ syntax = "proto3";

package oak.containers.example;

import "oak_crypto/proto/v1/crypto.proto";
import "proto/crypto/crypto.proto";

message HelloRequest {
oak.crypto.v1.EncryptedRequest encrypted_request = 1;
Expand Down
2 changes: 1 addition & 1 deletion oak_containers_hello_world_untrusted_app/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
generate_grpc_code(
&[
"../oak_containers_hello_world_trusted_app/proto/interface.proto",
"../oak_crypto/proto/v1/crypto.proto",
"../proto/crypto/crypto.proto",
],
"..",
CodegenOptions {
Expand Down
2 changes: 1 addition & 1 deletion oak_containers_launcher/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
generate_grpc_code(
&[
"../oak_containers/proto/interfaces.proto",
"../oak_crypto/proto/v1/crypto.proto",
"../proto/crypto/crypto.proto",
"../proto/key_provisioning/key_provisioning.proto",
"../proto/containers/hostlib_key_provisioning.proto",
"../proto/session/messages.proto",
Expand Down
Loading
Loading