TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix absl::WebSafeBase64Escape deprecation.

Browse Source 
PiperOrigin-RevId: 871947460
This commit is contained in:
Francis Tsui
2026-02-18 10:55:34 -08:00
committed by Copybara-Service
parent f42933f7d9
commit a60821574f
3 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/certificates/nearby_share_certificate_storage_impl.cc
+1 -7
View File
@@ -63,12 +63,6 @@ enum InitStatusMetric {
kMaxValue = kInvalidOperation
};
std::string EncodeString(absl::string_view unencoded_string) {
std::string result;
absl::WebSafeBase64Escape(unencoded_string, &result);
return result;
}
std::optional<std::string> DecodeString(const std::string* encoded_string) {
std::string result;
if (!encoded_string) return std::nullopt;
@@ -536,7 +530,7 @@ void NearbyShareCertificateStorageImpl::SavePublicCertificateExpirations() {
expirations.reserve(public_certificate_expirations_.size());
for (const std::pair<std::string, absl::Time>& pair :
public_certificate_expirations_) {
expirations.emplace_back(EncodeString(pair.first),
expirations.emplace_back(absl::WebSafeBase64Escape(pair.first),
absl::ToUnixNanos(pair.second));
}
sharing/certificates/nearby_share_certificate_storage_impl_test.cc
+1 -7
View File
@@ -104,12 +104,6 @@ constexpr char kMetadataEncryptionKey4[] = "metadataencryptionkey4";
constexpr char kEncryptedMetadataBytes4[] = "encryptedmetadatabytes4";
constexpr char kMetadataEncryptionKeyTag4[] = "metadataencryptionkeytag4";
std::string EncodeString(absl::string_view unencoded_string) {
std::string result;
absl::WebSafeBase64Escape(unencoded_string, &result);
return result;
}
PublicCertificate CreatePublicCertificate(
absl::string_view secret_id, absl::string_view secret_key,
absl::string_view public_key, int64_t start_seconds, int32_t start_nanos,
@@ -186,7 +180,7 @@ class NearbyShareCertificateStorageImplTest : public ::testing::Test {
std::vector<std::pair<std::string, int64_t>> expirations;
for (const auto& cert : pub_certs) {
expirations.emplace_back(
EncodeString(cert.secret_id()),
absl::WebSafeBase64Escape(cert.secret_id()),
absl::ToUnixNanos(TimestampToTime(cert.end_time())));
entries.emplace(cert.secret_id(), std::move(cert));
}
sharing/certificates/nearby_share_private_certificate.cc
+4 -9
View File
@@ -92,12 +92,6 @@ std::optional<std::vector<uint8_t>> CreateMetadataEncryptionKeyTag(
return result;
}
std::string EncodeString(absl::string_view unencoded_string) {
std::string result;
absl::WebSafeBase64Escape(unencoded_string, &result);
return result;
}
std::optional<std::string> DecodeString(const std::string* encoded_string) {
std::string result;
if (!encoded_string) return std::nullopt;
@@ -109,7 +103,8 @@ std::optional<std::string> DecodeString(const std::string* encoded_string) {
}
std::string BytesToEncodedString(const std::vector<uint8_t>& bytes) {
return EncodeString(std::string(bytes.begin(), bytes.end()));
return absl::WebSafeBase64Escape(std::string_view(
reinterpret_cast<const char*>(bytes.data()), bytes.size()));
}
std::optional<std::vector<uint8_t>> EncodedStringToBytes(
@@ -319,11 +314,11 @@ PrivateCertificateData NearbySharePrivateCertificate::ToCertificateData()
.not_before = absl::ToUnixNanos(not_before_),
.not_after = absl::ToUnixNanos(not_after_),
.key_pair = BytesToEncodedString(key_pair),
.secret_key = EncodeString(secret_key_->key()),
.secret_key = absl::WebSafeBase64Escape(secret_key_->key()),
.metadata_encryption_key = BytesToEncodedString(metadata_encryption_key_),
.id = BytesToEncodedString(id_),
.unencrypted_metadata_proto =
EncodeString(unencrypted_metadata_.SerializeAsString()),
absl::WebSafeBase64Escape(unencrypted_metadata_.SerializeAsString()),
.consumed_salts = SaltsToString(consumed_salts_),
};
}