9478437fde
1. Constructors, SetData(), and AppendData() now accept uint8_t*,
int8_t*, and char*. Previously, they accepted void*, meaning that
any kind of pointer was accepted. I think requiring an explicit
cast in cases where the input array isn't already of a byte-sized
type is a better compromise between convenience and safety.
2. data() can now return a uint8_t* instead of a char*, which seems
more appropriate for a byte array, and is harder to mix up with
zero-terminated C strings. data<int8_t>() is also available so
that callers that want that type instead won't have to cast, as
is data<char>() (which remains the default until all existing
callers have been fixed).
3. Constructors, SetData(), and AppendData() now accept arrays
natively, not just decayed to pointers. The advantage of this is
that callers don't have to pass the size separately.
4. There are new constructors that allow setting size and capacity
without initializing the array. Previously, this had to be done
separately after construction.
5. Instead of TransferTo(), Buffer now supports swap(), and move
construction and assignment, and has a Pass() method that works
just like std::move(). (The Pass method is modeled after
scoped_ptr::Pass().)
R=jmarusic@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42989004
Cr-Commit-Position: refs/heads/master@{#9033}
96 lines
2.8 KiB
C++
96 lines
2.8 KiB
C++
/*
|
|
* Copyright 2012 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/sslfingerprint.h"
|
|
|
|
#include <ctype.h>
|
|
#include <string>
|
|
|
|
#include "webrtc/base/helpers.h"
|
|
#include "webrtc/base/messagedigest.h"
|
|
#include "webrtc/base/stringencode.h"
|
|
|
|
namespace rtc {
|
|
|
|
SSLFingerprint* SSLFingerprint::Create(
|
|
const std::string& algorithm, const rtc::SSLIdentity* identity) {
|
|
if (!identity) {
|
|
return NULL;
|
|
}
|
|
|
|
return Create(algorithm, &(identity->certificate()));
|
|
}
|
|
|
|
SSLFingerprint* SSLFingerprint::Create(
|
|
const std::string& algorithm, const rtc::SSLCertificate* cert) {
|
|
uint8 digest_val[64];
|
|
size_t digest_len;
|
|
bool ret = cert->ComputeDigest(
|
|
algorithm, digest_val, sizeof(digest_val), &digest_len);
|
|
if (!ret) {
|
|
return NULL;
|
|
}
|
|
|
|
return new SSLFingerprint(algorithm, digest_val, digest_len);
|
|
}
|
|
|
|
SSLFingerprint* SSLFingerprint::CreateFromRfc4572(
|
|
const std::string& algorithm, const std::string& fingerprint) {
|
|
if (algorithm.empty() || !rtc::IsFips180DigestAlgorithm(algorithm))
|
|
return NULL;
|
|
|
|
if (fingerprint.empty())
|
|
return NULL;
|
|
|
|
size_t value_len;
|
|
char value[rtc::MessageDigest::kMaxSize];
|
|
value_len = rtc::hex_decode_with_delimiter(value, sizeof(value),
|
|
fingerprint.c_str(),
|
|
fingerprint.length(),
|
|
':');
|
|
if (!value_len)
|
|
return NULL;
|
|
|
|
return new SSLFingerprint(algorithm,
|
|
reinterpret_cast<uint8*>(value),
|
|
value_len);
|
|
}
|
|
|
|
SSLFingerprint::SSLFingerprint(
|
|
const std::string& algorithm, const uint8* digest_in, size_t digest_len)
|
|
: algorithm(algorithm) {
|
|
digest.SetData(digest_in, digest_len);
|
|
}
|
|
|
|
SSLFingerprint::SSLFingerprint(const SSLFingerprint& from)
|
|
: algorithm(from.algorithm), digest(from.digest) {}
|
|
|
|
bool SSLFingerprint::operator==(const SSLFingerprint& other) const {
|
|
return algorithm == other.algorithm &&
|
|
digest == other.digest;
|
|
}
|
|
|
|
std::string SSLFingerprint::GetRfc4572Fingerprint() const {
|
|
std::string fingerprint =
|
|
rtc::hex_encode_with_delimiter(digest.data<char>(), digest.size(), ':');
|
|
std::transform(fingerprint.begin(), fingerprint.end(),
|
|
fingerprint.begin(), ::toupper);
|
|
return fingerprint;
|
|
}
|
|
|
|
std::string SSLFingerprint::ToString() {
|
|
std::string fp_str = algorithm;
|
|
fp_str.append(" ");
|
|
fp_str.append(GetRfc4572Fingerprint());
|
|
return fp_str;
|
|
}
|
|
|
|
} // namespace rtc
|