This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
76 lines
1.9 KiB
C++
76 lines
1.9 KiB
C++
/*
|
|
* Copyright 2015 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/cryptstring.h"
|
|
|
|
namespace rtc {
|
|
|
|
size_t EmptyCryptStringImpl::GetLength() const {
|
|
return 0;
|
|
}
|
|
|
|
void EmptyCryptStringImpl::CopyTo(char* dest, bool nullterminate) const {
|
|
if (nullterminate) {
|
|
*dest = '\0';
|
|
}
|
|
}
|
|
|
|
std::string EmptyCryptStringImpl::UrlEncode() const {
|
|
return "";
|
|
}
|
|
|
|
CryptStringImpl* EmptyCryptStringImpl::Copy() const {
|
|
return new EmptyCryptStringImpl();
|
|
}
|
|
|
|
void EmptyCryptStringImpl::CopyRawTo(std::vector<unsigned char>* dest) const {
|
|
dest->clear();
|
|
}
|
|
|
|
CryptString::CryptString() : impl_(new EmptyCryptStringImpl()) {
|
|
}
|
|
|
|
CryptString::CryptString(const CryptString& other)
|
|
: impl_(other.impl_->Copy()) {
|
|
}
|
|
|
|
CryptString::CryptString(const CryptStringImpl& impl) : impl_(impl.Copy()) {
|
|
}
|
|
|
|
CryptString::~CryptString() = default;
|
|
|
|
size_t InsecureCryptStringImpl::GetLength() const {
|
|
return password_.size();
|
|
}
|
|
|
|
void InsecureCryptStringImpl::CopyTo(char* dest, bool nullterminate) const {
|
|
memcpy(dest, password_.data(), password_.size());
|
|
if (nullterminate)
|
|
dest[password_.size()] = 0;
|
|
}
|
|
|
|
std::string InsecureCryptStringImpl::UrlEncode() const {
|
|
return password_;
|
|
}
|
|
|
|
CryptStringImpl* InsecureCryptStringImpl::Copy() const {
|
|
InsecureCryptStringImpl* copy = new InsecureCryptStringImpl;
|
|
copy->password() = password_;
|
|
return copy;
|
|
}
|
|
|
|
void InsecureCryptStringImpl::CopyRawTo(
|
|
std::vector<unsigned char>* dest) const {
|
|
dest->resize(password_.size());
|
|
memcpy(&dest->front(), password_.data(), password_.size());
|
|
}
|
|
|
|
}; // namespace rtc
|