| Index: webrtc/base/opensslidentity.h
|
| diff --git a/webrtc/base/opensslidentity.h b/webrtc/base/opensslidentity.h
|
| index ee7aabedd1080ddc01d436e91c6312c06cf1c9a6..4d63c4a9dbec55d4fad04179cfaf911178c824d0 100644
|
| --- a/webrtc/base/opensslidentity.h
|
| +++ b/webrtc/base/opensslidentity.h
|
| @@ -32,7 +32,7 @@ class OpenSSLKeyPair {
|
| ASSERT(pkey_ != NULL);
|
| }
|
|
|
| - static OpenSSLKeyPair* Generate();
|
| + static OpenSSLKeyPair* Generate(KeyType key_type);
|
|
|
| virtual ~OpenSSLKeyPair();
|
|
|
| @@ -99,8 +99,10 @@ class OpenSSLCertificate : public SSLCertificate {
|
| // them consistently.
|
| class OpenSSLIdentity : public SSLIdentity {
|
| public:
|
| - static OpenSSLIdentity* Generate(const std::string& common_name);
|
| - static OpenSSLIdentity* GenerateForTest(const SSLIdentityParams& params);
|
| + static OpenSSLIdentity* Generate(const std::string& common_name,
|
| + KeyType key_type);
|
| + static OpenSSLIdentity* GenerateForTest(const SSLIdentityParams& params,
|
| + KeyType key_type);
|
| static SSLIdentity* FromPEMStrings(const std::string& private_key,
|
| const std::string& certificate);
|
| ~OpenSSLIdentity() override;
|
| @@ -114,7 +116,8 @@ class OpenSSLIdentity : public SSLIdentity {
|
| private:
|
| OpenSSLIdentity(OpenSSLKeyPair* key_pair, OpenSSLCertificate* certificate);
|
|
|
| - static OpenSSLIdentity* GenerateInternal(const SSLIdentityParams& params);
|
| + static OpenSSLIdentity* GenerateInternal(const SSLIdentityParams& params,
|
| + KeyType key_type);
|
|
|
| scoped_ptr<OpenSSLKeyPair> key_pair_;
|
| scoped_ptr<OpenSSLCertificate> certificate_;
|
|
|