Index: webrtc/base/opensslidentity.h |
diff --git a/webrtc/base/opensslidentity.h b/webrtc/base/opensslidentity.h |
index df495087e3574d5cd7a8d6051c484e7eb16dba58..31231bfc1cac01e957e51bfc96269096023edbcc 100644 |
--- a/webrtc/base/opensslidentity.h |
+++ b/webrtc/base/opensslidentity.h |
@@ -33,12 +33,20 @@ class OpenSSLKeyPair { |
} |
static OpenSSLKeyPair* Generate(const KeyParams& key_params); |
+ // Constructs a key pair from the private key PEM string. This must not result |
+ // in missing public key parameters. Returns null on error. |
+ static OpenSSLKeyPair* FromPrivateKeyPEMString( |
+ const std::string& pem_string); |
virtual ~OpenSSLKeyPair(); |
virtual OpenSSLKeyPair* GetReference(); |
EVP_PKEY* pkey() const { return pkey_; } |
+ std::string PrivateKeyToPEMString() const; |
+ std::string PublicKeyToPEMString() const; |
+ bool operator==(const OpenSSLKeyPair& other) const; |
+ bool operator!=(const OpenSSLKeyPair& other) const; |
torbjorng (webrtc)
2016/04/26 13:35:51
It is not clear that we should have a != operator.
hbos
2016/04/27 07:52:09
I'm thinking if we have an "equals" then "not equa
nisse-webrtc
2016/04/27 08:05:46
I think I'd prefer to drop the operator overloadin
hbos
2016/04/27 09:00:45
From offline discussion: style guide prefers == ov
|
private: |
void AddReference(); |
@@ -68,8 +76,9 @@ class OpenSSLCertificate : public SSLCertificate { |
X509* x509() const { return x509_; } |
std::string ToPEMString() const override; |
- |
void ToDER(Buffer* der_buffer) const override; |
+ bool operator==(const OpenSSLCertificate& other) const; |
+ bool operator!=(const OpenSSLCertificate& other) const; |
// Compute the digest of the certificate given algorithm |
bool ComputeDigest(const std::string& algorithm, |
@@ -115,6 +124,11 @@ class OpenSSLIdentity : public SSLIdentity { |
// Configure an SSL context object to use our key and certificate. |
bool ConfigureIdentity(SSL_CTX* ctx); |
+ std::string PrivateKeyToPEMString() const override; |
+ std::string PublicKeyToPEMString() const override; |
+ bool operator==(const OpenSSLIdentity& other) const; |
+ bool operator!=(const OpenSSLIdentity& other) const; |
+ |
private: |
OpenSSLIdentity(OpenSSLKeyPair* key_pair, OpenSSLCertificate* certificate); |