RTCCertificate serialization.

webrtc/base/opensslidentity.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 
 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object,
 // which is reference counted inside the OpenSSL library.
 class OpenSSLKeyPair {
  public:
   explicit OpenSSLKeyPair(EVP_PKEY* pkey) : pkey_(pkey) {
     ASSERT(pkey_ != NULL);
   }
 
   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. It will return true for
invalid compares (which might make sense, or not).

(Here and in for at least two more types.)

[hbos, 2016/04/27 07:52:09]

I'm thinking if we have an "equals" then "not equals" should be well defined,
that they go hand in hand if operators are used as expected. Do you want me to
remove it?

[nisse-webrtc, 2016/04/27 08:05:46]

I think I'd prefer to drop the operator overloading. These comparison functions
are obscure, and I don't think they should ever be used except by the tests. And
then they deserve longer names making their use more explicit.

[hbos, 2016/04/27 09:00:45]

From offline discussion: style guide prefers == over Equals function, keeping
as-is.

 
  private:
   void AddReference();
 
   EVP_PKEY* pkey_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyPair);
 };
 
 // OpenSSLCertificate encapsulates an OpenSSL X509* certificate object,
 // which is also reference counted inside the OpenSSL library.
 class OpenSSLCertificate : public SSLCertificate {
  public:
   // Caller retains ownership of the X509 object.
   explicit OpenSSLCertificate(X509* x509) : x509_(x509) {
     AddReference();
   }
 
   static OpenSSLCertificate* Generate(OpenSSLKeyPair* key_pair,
                                       const SSLIdentityParams& params);
   static OpenSSLCertificate* FromPEMString(const std::string& pem_string);
 
   ~OpenSSLCertificate() override;
 
   OpenSSLCertificate* GetReference() const override;
 
   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,
                      unsigned char* digest,
                      size_t size,
                      size_t* length) const override;
 
   // Compute the digest of a certificate as an X509 *
   static bool ComputeDigest(const X509* x509,
                             const std::string& algorithm,
@@ skipping 25 matching lines @@
   static SSLIdentity* FromPEMStrings(const std::string& private_key,
                                      const std::string& certificate);
   ~OpenSSLIdentity() override;
 
   const OpenSSLCertificate& certificate() const override;
   OpenSSLIdentity* GetReference() const override;
 
   // 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);
 
   static OpenSSLIdentity* GenerateInternal(const SSLIdentityParams& params);
 
   scoped_ptr<OpenSSLKeyPair> key_pair_;
   scoped_ptr<OpenSSLCertificate> certificate_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity);
 };
 
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_OPENSSLIDENTITY_H_