generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebase webrtc/base with r6863 version of talk/base:

Browse Source 
cls integrated: r6809
svn diff -r 6808:6809 http://webrtc.googlecode.com/svn/trunk/talk/base > 6809.diff
patch -p0 -i 6809.diff

BUG=3379
TBR=solenberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18089004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6864 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org 2014-08-11 14:32:13 +00:00
parent 730bf30da7
commit 065247b5b7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/fakesslidentity.h
View File

@ -65,6 +65,7 @@ class FakeSSLCertificate : public rtc::SSLCertificate {
std::vector<SSLCertificate*> new_certs(certs_.size()); std::vector<SSLCertificate*> new_certs(certs_.size());
std::transform(certs_.begin(), certs_.end(), new_certs.begin(), DupCert); std::transform(certs_.begin(), certs_.end(), new_certs.begin(), DupCert);
*chain = new SSLCertChain(new_certs); *chain = new SSLCertChain(new_certs);
std::for_each(new_certs.begin(), new_certs.end(), DeleteCert);
return true; return true;
} }
@ -72,6 +73,7 @@ class FakeSSLCertificate : public rtc::SSLCertificate {
static FakeSSLCertificate* DupCert(FakeSSLCertificate cert) { static FakeSSLCertificate* DupCert(FakeSSLCertificate cert) {
return cert.GetReference(); return cert.GetReference();
} }
static void DeleteCert(SSLCertificate* cert) { delete cert; }
std::string data_; std::string data_;
std::vector<FakeSSLCertificate> certs_; std::vector<FakeSSLCertificate> certs_;
std::string digest_algorithm_; std::string digest_algorithm_;