Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/cpp/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ cc_library(
],
deps = [
"//:cc_proto",
"@com_google_absl//absl/strings:string_view",
"//src/securemessage:securemessage_common",
"//src/securemessage:securemessage_cpp_protobuf",
"//src/securemessage:securemessage_openssl",
Expand Down
2 changes: 2 additions & 0 deletions src/main/cpp/include/securegcm/d2d_connection_context_v1.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <memory>
#include <string>

#include "absl/strings/string_view.h"
#include "src/securemessage/include/securemessage/crypto_ops.h"

namespace securegcm {
Expand All @@ -40,6 +41,7 @@ class D2DConnectionContextV1 {
//
// On failure, nullptr is returned.
std::unique_ptr<string> EncodeMessageToPeer(const string& payload);
std::unique_ptr<string> EncodeMessageToPeer(absl::string_view payload);

// Once the initiator and responder have negotiated a secret key, use this
// method to decrypt and verify a |message| received from the other device.
Expand Down
8 changes: 7 additions & 1 deletion src/main/cpp/src/securegcm/d2d_connection_context_v1.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <limits>
#include <sstream>

#include "absl/strings/string_view.h"
#include "device_to_device_messages.pb.h"
#include "securegcm.pb.h"
#include "src/main/cpp/include/securegcm/d2d_crypto_ops.h"
Expand Down Expand Up @@ -66,7 +67,7 @@ const int kSavedSessionLength = kDecodeKeyStart + kAesKeyLength;

// Convenience function to creates a DeviceToDeviceMessage proto with |payload|
// and |sequence_number|.
DeviceToDeviceMessage CreateDeviceToDeviceMessage(const std::string& payload,
DeviceToDeviceMessage CreateDeviceToDeviceMessage(absl::string_view payload,
uint32_t sequence_number) {
DeviceToDeviceMessage device_to_device_message;
device_to_device_message.set_sequence_number(sequence_number);
Expand Down Expand Up @@ -98,6 +99,11 @@ D2DConnectionContextV1::D2DConnectionContextV1(

std::unique_ptr<std::string> D2DConnectionContextV1::EncodeMessageToPeer(
const std::string& payload) {
return EncodeMessageToPeer(absl::string_view(payload));
}

std::unique_ptr<std::string> D2DConnectionContextV1::EncodeMessageToPeer(
absl::string_view payload) {
encode_sequence_number_++;
const DeviceToDeviceMessage message =
CreateDeviceToDeviceMessage(payload, encode_sequence_number_);
Expand Down