zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Purge nss files and dependencies.

Browse Source 
This replaces https://codereview.webrtc.org/1313233005
which was reverted after triggering Chromium issues.
The only difference is that we're cleaned up dependencies
on use_openssl from the gyp file.

Since https://codereview.chromium.org/1358913003 landed,
this CL should cause no Chromium issues.

BUG=webrtc:4497

Review URL: https://codereview.webrtc.org/1351503004

Cr-Commit-Position: refs/heads/master@{#10019}
This commit is contained in:
torbjorng
2015-09-22 11:58:04 -07:00
committed by Commit bot
parent 7404368998
commit 07d09364b0
17 changed files with 32 additions and 2240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
webrtc/base/sslidentity.cc
View File

@ -27,10 +27,6 @@
#include "webrtc/base/opensslidentity.h"
#elif SSL_USE_NSS // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
#include "webrtc/base/nssidentity.h"
#endif // SSL_USE_SCHANNEL
namespace rtc {
@ -147,27 +143,7 @@ SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
return OpenSSLIdentity::FromPEMStrings(private_key, certificate);
}
#elif SSL_USE_NSS // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) {
return NSSCertificate::FromPEMString(pem_string);
}
SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
KeyType key_type) {
return NSSIdentity::Generate(common_name, key_type);
}
SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
return NSSIdentity::GenerateForTest(params);
}
SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key,
const std::string& certificate) {
return NSSIdentity::FromPEMStrings(private_key, certificate);
}
#else // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL && !SSL_USE_NSS
#else // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
#error "No SSL implementation"