From a3dc79e0721f1e3d115ba9b52bb91cb8375d582c Mon Sep 17 00:00:00 2001 From: Torbjorn Granlund Date: Tue, 16 Feb 2016 13:33:53 +0100 Subject: [PATCH] Move SSLIdentity Generate() implementations from .h to .cc file. This amends https://codereview.webrtc.org/1683193003/ BUG= R=hbos@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1701953002 . Cr-Commit-Position: refs/heads/master@{#11632} --- webrtc/base/sslidentity.cc | 17 +++++++++++++++++ webrtc/base/sslidentity.h | 8 ++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/webrtc/base/sslidentity.cc b/webrtc/base/sslidentity.cc index 536e3aa7dc..3673d74feb 100644 --- a/webrtc/base/sslidentity.cc +++ b/webrtc/base/sslidentity.cc @@ -154,10 +154,12 @@ SSLCertChain::~SSLCertChain() { #if SSL_USE_OPENSSL +// static SSLCertificate* SSLCertificate::FromPEMString(const std::string& pem_string) { return OpenSSLCertificate::FromPEMString(pem_string); } +// static SSLIdentity* SSLIdentity::Generate(const std::string& common_name, const KeyParams& key_params, time_t certificate_lifetime) { @@ -165,10 +167,25 @@ SSLIdentity* SSLIdentity::Generate(const std::string& common_name, certificate_lifetime); } +// static +SSLIdentity* SSLIdentity::Generate(const std::string& common_name, + const KeyParams& key_params) { + return OpenSSLIdentity::Generate(common_name, key_params, + kDefaultCertificateLifetime); +} + +// static +SSLIdentity* SSLIdentity::Generate(const std::string& common_name, + KeyType key_type) { + return OpenSSLIdentity::Generate(common_name, KeyParams(key_type), + kDefaultCertificateLifetime); +} + SSLIdentity* SSLIdentity::GenerateForTest(const SSLIdentityParams& params) { return OpenSSLIdentity::GenerateForTest(params); } +// static SSLIdentity* SSLIdentity::FromPEMStrings(const std::string& private_key, const std::string& certificate) { return OpenSSLIdentity::FromPEMStrings(private_key, certificate); diff --git a/webrtc/base/sslidentity.h b/webrtc/base/sslidentity.h index 0f81929cc4..8793e4b2de 100644 --- a/webrtc/base/sslidentity.h +++ b/webrtc/base/sslidentity.h @@ -201,13 +201,9 @@ class SSLIdentity { const KeyParams& key_param, time_t certificate_lifetime); static SSLIdentity* Generate(const std::string& common_name, - const KeyParams& key_param) { - return Generate(common_name, key_param, kDefaultCertificateLifetime); - } + const KeyParams& key_param); static SSLIdentity* Generate(const std::string& common_name, - KeyType key_type) { - return Generate(common_name, KeyParams(key_type)); - } + KeyType key_type); // Generates an identity with the specified validity period. // TODO(torbjorng): Now that Generate() accepts relevant params, make tests