Reland: Use unique_ptr and ArrayView in SSLFingerprint
Bug: webrtc:9860
Change-Id: Ia6a0e82d6eff384fe3f618c77e8c78e45569eb97
Tbr: Benjamin Wright <benwright@webrtc.org>
Tbr: Qingsi Wang <qingsi@webrtc.org>
Reviewed-on: https://webrtc-review.googlesource.com/c/106180
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25219}diff --git a/rtc_base/sslfingerprint.cc b/rtc_base/sslfingerprint.cc
index 4f1ae8f..ef46654 100644
--- a/rtc_base/sslfingerprint.cc
+++ b/rtc_base/sslfingerprint.cc
@@ -21,56 +21,66 @@
SSLFingerprint* SSLFingerprint::Create(const std::string& algorithm,
const rtc::SSLIdentity* identity) {
- if (!identity) {
- return nullptr;
- }
-
- return Create(algorithm, &(identity->certificate()));
+ return CreateUnique(algorithm, *identity).release();
}
-SSLFingerprint* SSLFingerprint::Create(const std::string& algorithm,
- const rtc::SSLCertificate* cert) {
+std::unique_ptr<SSLFingerprint> SSLFingerprint::CreateUnique(
+ const std::string& algorithm,
+ const rtc::SSLIdentity& identity) {
+ return Create(algorithm, identity.certificate());
+}
+
+std::unique_ptr<SSLFingerprint> SSLFingerprint::Create(
+ const std::string& algorithm,
+ const rtc::SSLCertificate& cert) {
uint8_t digest_val[64];
size_t digest_len;
- bool ret = cert->ComputeDigest(algorithm, digest_val, sizeof(digest_val),
- &digest_len);
+ bool ret = cert.ComputeDigest(algorithm, digest_val, sizeof(digest_val),
+ &digest_len);
if (!ret) {
return nullptr;
}
-
- return new SSLFingerprint(algorithm, digest_val, digest_len);
+ return absl::make_unique<SSLFingerprint>(
+ algorithm, ArrayView<const uint8_t>(digest_val, digest_len));
}
SSLFingerprint* SSLFingerprint::CreateFromRfc4572(
const std::string& algorithm,
const std::string& fingerprint) {
+ return CreateUniqueFromRfc4572(algorithm, fingerprint).release();
+}
+
+std::unique_ptr<SSLFingerprint> SSLFingerprint::CreateUniqueFromRfc4572(
+ const std::string& algorithm,
+ const std::string& fingerprint) {
if (algorithm.empty() || !rtc::IsFips180DigestAlgorithm(algorithm))
return nullptr;
if (fingerprint.empty())
return nullptr;
- size_t value_len;
char value[rtc::MessageDigest::kMaxSize];
- value_len = rtc::hex_decode_with_delimiter(
+ size_t value_len = rtc::hex_decode_with_delimiter(
value, sizeof(value), fingerprint.c_str(), fingerprint.length(), ':');
if (!value_len)
return nullptr;
- return new SSLFingerprint(algorithm, reinterpret_cast<uint8_t*>(value),
- value_len);
+ return absl::make_unique<SSLFingerprint>(
+ algorithm,
+ ArrayView<const uint8_t>(reinterpret_cast<uint8_t*>(value), value_len));
}
-SSLFingerprint* SSLFingerprint::CreateFromCertificate(
- const RTCCertificate* cert) {
+std::unique_ptr<SSLFingerprint> SSLFingerprint::CreateFromCertificate(
+ const RTCCertificate& cert) {
std::string digest_alg;
- if (!cert->ssl_certificate().GetSignatureDigestAlgorithm(&digest_alg)) {
+ if (!cert.ssl_certificate().GetSignatureDigestAlgorithm(&digest_alg)) {
RTC_LOG(LS_ERROR)
<< "Failed to retrieve the certificate's digest algorithm";
return nullptr;
}
- SSLFingerprint* fingerprint = Create(digest_alg, cert->identity());
+ std::unique_ptr<SSLFingerprint> fingerprint =
+ CreateUnique(digest_alg, *cert.identity());
if (!fingerprint) {
RTC_LOG(LS_ERROR) << "Failed to create identity fingerprint, alg="
<< digest_alg;
@@ -79,11 +89,13 @@
}
SSLFingerprint::SSLFingerprint(const std::string& algorithm,
+ ArrayView<const uint8_t> digest_view)
+ : algorithm(algorithm), digest(digest_view.data(), digest_view.size()) {}
+
+SSLFingerprint::SSLFingerprint(const std::string& algorithm,
const uint8_t* digest_in,
size_t digest_len)
- : algorithm(algorithm) {
- digest.SetData(digest_in, digest_len);
-}
+ : SSLFingerprint(algorithm, MakeArrayView(digest_in, digest_len)) {}
SSLFingerprint::SSLFingerprint(const SSLFingerprint& from)
: algorithm(from.algorithm), digest(from.digest) {}