Revert "Use CRYPTO_BUFFER APIs instead of X509 when building with BoringSSL."
This reverts commit 72f638a9a279e7abb5534fa66a0ade2cf18ec1a7. Reason for revert: downstream build failures Original change's description: > Use CRYPTO_BUFFER APIs instead of X509 when building with BoringSSL. > > Using CRYPTO_BUFFERs instead of legacy X509 objects offers memory and > security gains, and will provide binary size improvements as well once > the default list of built-in certificates can be removed; the code > dealing with them still depends on the X509 API. > > Implemented by splitting openssl_identity and openssl_certificate > into BoringSSL and vanilla OpenSSL implementations. > > Bug: webrtc:11410 > Change-Id: Idc043462faac5e4ab1b75bedab2057197f80aba6 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174120 > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > Reviewed-by: David Benjamin <davidben@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Taylor <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#32811} TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,davidben@webrtc.org,hta@webrtc.org Change-Id: Ib5e55cb5798a2f3d25a4460f5311d2e650d3fa82 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:11410 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196742 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Commit-Queue: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#32812}
This commit is contained in:
committed by
Commit Bot
parent
72f638a9a2
commit
7e6290d1d2
@ -1,60 +0,0 @@
|
||||
/*
|
||||
* Copyright 2020 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 RTC_BASE_OPENSSL_KEY_PAIR_H_
|
||||
#define RTC_BASE_OPENSSL_KEY_PAIR_H_
|
||||
|
||||
#include <openssl/ossl_typ.h>
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include "rtc_base/checks.h"
|
||||
#include "rtc_base/constructor_magic.h"
|
||||
#include "rtc_base/ssl_identity.h"
|
||||
|
||||
namespace rtc {
|
||||
|
||||
// OpenSSLKeyPair encapsulates an OpenSSL EVP_PKEY* keypair object,
|
||||
// which is reference counted inside the OpenSSL library.
|
||||
class OpenSSLKeyPair final {
|
||||
public:
|
||||
// Takes ownership of the key.
|
||||
explicit OpenSSLKeyPair(EVP_PKEY* pkey) : pkey_(pkey) {
|
||||
RTC_DCHECK(pkey_ != nullptr);
|
||||
}
|
||||
|
||||
static std::unique_ptr<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 std::unique_ptr<OpenSSLKeyPair> FromPrivateKeyPEMString(
|
||||
const std::string& pem_string);
|
||||
|
||||
~OpenSSLKeyPair();
|
||||
|
||||
std::unique_ptr<OpenSSLKeyPair> Clone();
|
||||
|
||||
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;
|
||||
|
||||
private:
|
||||
void AddReference();
|
||||
|
||||
EVP_PKEY* pkey_;
|
||||
|
||||
RTC_DISALLOW_COPY_AND_ASSIGN(OpenSSLKeyPair);
|
||||
};
|
||||
|
||||
} // namespace rtc
|
||||
|
||||
#endif // RTC_BASE_OPENSSL_KEY_PAIR_H_
|
||||
Reference in New Issue
Block a user