Implement GetChain for OpenSSLCertificate.

webrtc/rtc_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.
  */
 
 #ifndef WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_
 #define WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_
 
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/rtc_base/sslidentity.h"
 
 typedef struct ssl_ctx_st SSL_CTX;
 
 namespace rtc {
 
 // OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object,
@@ skipping 26 matching lines @@
   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();
-  }
+  explicit OpenSSLCertificate(X509* x509);
+
+  // Caller retains owership of STACK_OF(X509).
+  explicit OpenSSLCertificate(STACK_OF(X509)* chain);
 
   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_; }
@@ skipping 15 matching lines @@
                             unsigned char* digest,
                             size_t size,
                             size_t* length);
 
   bool GetSignatureDigestAlgorithm(std::string* algorithm) const override;
   std::unique_ptr<SSLCertChain> GetChain() const override;
 
   int64_t CertificateExpirationTime() const override;
 
  private:
-  void AddReference() const;
+  void AddReference(X509* x509) const;
 
   X509* x509_;
+  // Non-leaf certificate chain.
+  std::vector<OpenSSLCertificate*> cert_chain_;

[davidben_webrtc, 2017/09/26 23:21:46]

You don't seem to free this in the destructor. This is a memory leak, no? You
probably want std::vector<std::unique_ptr<OpenSSLCertificate>>.

 
   RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLCertificate);
 };
 
 // Holds a keypair and certificate together, and a method to generate
 // them consistently.
 class OpenSSLIdentity : public SSLIdentity {
  public:
   static OpenSSLIdentity* GenerateWithExpiration(const std::string& common_name,
                                                  const KeyParams& key_params,
@@ skipping 22 matching lines @@
   std::unique_ptr<OpenSSLKeyPair> key_pair_;
   std::unique_ptr<OpenSSLCertificate> certificate_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLIdentity);
 };
 
 
 }  // namespace rtc
 
 #endif  // WEBRTC_RTC_BASE_OPENSSLIDENTITY_H_