admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove OpenSSLIdentity::GenerateWithExpiration.

Browse Source 
These static functions were marked as deprecated and since they
are not used this CL just removes them.

Bug: webrtc:10198
Change-Id: I4872e31701543c988fe71ab4e0b32bd73ff07753
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173467
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31057}
This commit is contained in:
Mirko Bonadei 2020-04-12 18:36:55 +02:00 committed by Commit Bot
parent 2d2c2947fd
commit 9f297b5960
4 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtc_base/openssl_identity.cc
View File

@ -241,14 +241,6 @@ std::unique_ptr<OpenSSLIdentity> OpenSSLIdentity::CreateWithExpiration(
return CreateInternal(params);
}
OpenSSLIdentity* OpenSSLIdentity::GenerateWithExpiration(
const std::string& common_name,
const KeyParams& key_params,
time_t certificate_lifetime) {
return CreateWithExpiration(common_name, key_params, certificate_lifetime)
.release();
}
std::unique_ptr<OpenSSLIdentity> OpenSSLIdentity::CreateForTest(
const SSLIdentityParams& params) {
return CreateInternal(params);

5
rtc_base/openssl_identity.h
View File

@ -72,10 +72,7 @@ class OpenSSLIdentity final : public SSLIdentity {
static std::unique_ptr<SSLIdentity> CreateFromPEMChainStrings(
const std::string& private_key,
const std::string& certificate_chain);
// Deprecated versions
static OpenSSLIdentity* GenerateWithExpiration(const std::string& common_name,
const KeyParams& key_params,
time_t certificate_lifetime);
// Deprecated
static OpenSSLIdentity* GenerateForTest(const SSLIdentityParams& params);
static SSLIdentity* FromPEMStrings(const std::string& private_key,
const std::string& certificate);

22
rtc_base/ssl_identity.cc
View File

@ -254,28 +254,6 @@ std::unique_ptr<SSLIdentity> SSLIdentity::CreateFromPEMChainStrings(
certificate_chain);
}
// static
SSLIdentity* SSLIdentity::GenerateWithExpiration(const std::string& common_name,
const KeyParams& key_params,
time_t certificate_lifetime) {
return OpenSSLIdentity::GenerateWithExpiration(common_name, key_params,
certificate_lifetime);
}
// static
SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
const KeyParams& key_params) {
return OpenSSLIdentity::GenerateWithExpiration(
common_name, key_params, kDefaultCertificateLifetimeInSeconds);
}
// static
SSLIdentity* SSLIdentity::Generate(const std::string& common_name,
KeyType key_type) {
return OpenSSLIdentity::GenerateWithExpiration(
common_name, KeyParams(key_type), kDefaultCertificateLifetimeInSeconds);
}
SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) {
return OpenSSLIdentity::GenerateForTest(params);
}

11
rtc_base/ssl_identity.h
View File

@ -129,17 +129,6 @@ class RTC_EXPORT SSLIdentity {
const std::string& private_key,
const std::string& certificate_chain);
// Old versions of Create(). These return a pointer, but still require the
// caller to take ownership.
RTC_DEPRECATED static SSLIdentity* GenerateWithExpiration(
const std::string& common_name,
const KeyParams& key_param,
time_t certificate_lifetime);
RTC_DEPRECATED static SSLIdentity* Generate(const std::string& common_name,
const KeyParams& key_param);
RTC_DEPRECATED static SSLIdentity* Generate(const std::string& common_name,
KeyType key_type);
// Generates an identity with the specified validity period.
// TODO(torbjorng): Now that Generate() accepts relevant params, make tests
// use that instead of this function.