2017-01-24 00:46:16 +00:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This package is an SSL implementation written
|
|
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
|
|
|
*
|
|
|
|
* This library is free for commercial and non-commercial use as long as
|
|
|
|
* the following conditions are aheared to. The following conditions
|
|
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
|
|
* included with this distribution is covered by the same copyright terms
|
|
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
|
|
* the code are not to be removed.
|
|
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
|
|
* as the author of the parts of the library used.
|
|
|
|
* This can be in the form of a textual message at program startup or
|
|
|
|
* in documentation (online or textual) provided with the package.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* "This product includes cryptographic software written by
|
|
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
|
|
* being used are not cryptographic related :-).
|
|
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
|
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* The licence and distribution terms for any publically available version or
|
|
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
|
|
* copied and put under another distribution licence
|
|
|
|
* [including the GNU Public Licence.]
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* openssl-core@openssl.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
|
|
|
|
* ECC cipher suite support in OpenSSL originally developed by
|
|
|
|
* SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright 2005 Nokia. All rights reserved.
|
|
|
|
*
|
|
|
|
* The portions of the attached software ("Contribution") is developed by
|
|
|
|
* Nokia Corporation and is licensed pursuant to the OpenSSL open source
|
|
|
|
* license.
|
|
|
|
*
|
|
|
|
* The Contribution, originally written by Mika Kousa and Pasi Eronen of
|
|
|
|
* Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
|
|
|
|
* support (see RFC 4279) to OpenSSL.
|
|
|
|
*
|
|
|
|
* No patent licenses or other rights except those expressly stated in
|
|
|
|
* the OpenSSL open source license shall be deemed granted or received
|
|
|
|
* expressly, by implication, estoppel, or otherwise.
|
|
|
|
*
|
|
|
|
* No assurances are provided by Nokia that the Contribution does not
|
|
|
|
* infringe the patent or other intellectual property rights of any third
|
|
|
|
* party or that the license provides you with all the necessary rights
|
|
|
|
* to make use of the Contribution.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
|
|
|
|
* ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
|
|
|
|
* SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
|
|
|
|
* OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
|
|
|
|
* OTHERWISE. */
|
|
|
|
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
|
2017-02-01 19:59:18 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
2017-02-01 23:49:37 +00:00
|
|
|
#include <openssl/asn1.h>
|
|
|
|
#include <openssl/bytestring.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/pem.h>
|
2017-01-24 00:46:16 +00:00
|
|
|
#include <openssl/stack.h>
|
|
|
|
#include <openssl/x509.h>
|
2017-02-01 19:59:18 +00:00
|
|
|
#include <openssl/x509v3.h>
|
2017-01-24 00:46:16 +00:00
|
|
|
#include <openssl/x509_vfy.h>
|
|
|
|
|
|
|
|
#include "internal.h"
|
2017-02-02 18:57:17 +00:00
|
|
|
#include "../crypto/internal.h"
|
2017-01-24 00:46:16 +00:00
|
|
|
|
|
|
|
|
Support symbol prefixes
- In base.h, if BORINGSSL_PREFIX is defined, include
boringssl_prefix_symbols.h
- In all .S files, if BORINGSSL_PREFIX is defined, include
boringssl_prefix_symbols_asm.h
- In base.h, BSSL_NAMESPACE_BEGIN and BSSL_NAMESPACE_END are
defined with appropriate values depending on whether
BORINGSSL_PREFIX is defined; these macros are used in place
of 'namespace bssl {' and '}'
- Add util/make_prefix_headers.go, which takes a list of symbols
and auto-generates the header files mentioned above
- In CMakeLists.txt, if BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS
are defined, run util/make_prefix_headers.go to generate header
files
- In various CMakeLists.txt files, add "global_target" that all
targets depend on to give us a place to hook logic that must run
before all other targets (in particular, the header file generation
logic)
- Document this in BUILDING.md, including the fact that it is
the caller's responsibility to provide the symbol list and keep it
up to date
- Note that this scheme has not been tested on Windows, and likely
does not work on it; Windows support will need to be added in a
future commit
Change-Id: If66a7157f46b5b66230ef91e15826b910cf979a2
Reviewed-on: https://boringssl-review.googlesource.com/31364
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>
2018-08-27 02:53:36 +01:00
|
|
|
BSSL_NAMESPACE_BEGIN
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// check_ssl_x509_method asserts that |ssl| has the X509-based method
|
|
|
|
// installed. Calling an X509-based method on an |ssl| with a different method
|
|
|
|
// will likely misbehave and possibly crash or leak memory.
|
2017-02-10 21:30:23 +00:00
|
|
|
static void check_ssl_x509_method(const SSL *ssl) {
|
|
|
|
assert(ssl == NULL || ssl->ctx->x509_method == &ssl_crypto_x509_method);
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// check_ssl_ctx_x509_method acts like |check_ssl_x509_method|, but for an
|
|
|
|
// |SSL_CTX|.
|
2017-02-10 21:30:23 +00:00
|
|
|
static void check_ssl_ctx_x509_method(const SSL_CTX *ctx) {
|
|
|
|
assert(ctx == NULL || ctx->x509_method == &ssl_crypto_x509_method);
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// x509_to_buffer returns a |CRYPTO_BUFFER| that contains the serialised
|
|
|
|
// contents of |x509|.
|
2017-07-26 03:36:00 +01:00
|
|
|
static UniquePtr<CRYPTO_BUFFER> x509_to_buffer(X509 *x509) {
|
2017-02-10 23:24:56 +00:00
|
|
|
uint8_t *buf = NULL;
|
|
|
|
int cert_len = i2d_X509(x509, &buf);
|
|
|
|
if (cert_len <= 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer(CRYPTO_BUFFER_new(buf, cert_len, NULL));
|
2017-02-10 23:24:56 +00:00
|
|
|
OPENSSL_free(buf);
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// new_leafless_chain returns a fresh stack of buffers set to {NULL}.
|
2018-04-12 21:11:15 +01:00
|
|
|
static UniquePtr<STACK_OF(CRYPTO_BUFFER)> new_leafless_chain(void) {
|
|
|
|
UniquePtr<STACK_OF(CRYPTO_BUFFER)> chain(sk_CRYPTO_BUFFER_new_null());
|
|
|
|
if (!chain ||
|
|
|
|
!sk_CRYPTO_BUFFER_push(chain.get(), nullptr)) {
|
|
|
|
return nullptr;
|
2017-02-10 23:24:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return chain;
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// ssl_cert_set_chain sets elements 1.. of |cert->chain| to the serialised
|
|
|
|
// forms of elements of |chain|. It returns one on success or zero on error, in
|
|
|
|
// which case no change to |cert->chain| is made. It preverses the existing
|
|
|
|
// leaf from |cert->chain|, if any.
|
2017-02-10 23:24:56 +00:00
|
|
|
static int ssl_cert_set_chain(CERT *cert, STACK_OF(X509) *chain) {
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<STACK_OF(CRYPTO_BUFFER)> new_chain;
|
2017-02-10 23:24:56 +00:00
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
if (cert->chain != nullptr) {
|
2017-07-26 03:36:00 +01:00
|
|
|
new_chain.reset(sk_CRYPTO_BUFFER_new_null());
|
|
|
|
if (!new_chain) {
|
2017-02-10 23:24:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-06-29 22:46:42 +01:00
|
|
|
// |leaf| might be NULL if it's a “leafless” chain.
|
2018-04-12 21:11:15 +01:00
|
|
|
CRYPTO_BUFFER *leaf = sk_CRYPTO_BUFFER_value(cert->chain.get(), 0);
|
2018-06-29 22:46:42 +01:00
|
|
|
if (!PushToStack(new_chain.get(), UpRef(leaf))) {
|
2017-07-26 03:36:00 +01:00
|
|
|
return 0;
|
2017-02-10 23:24:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
for (X509 *x509 : chain) {
|
|
|
|
if (!new_chain) {
|
2018-04-12 21:11:15 +01:00
|
|
|
new_chain = new_leafless_chain();
|
2017-07-26 03:36:00 +01:00
|
|
|
if (!new_chain) {
|
|
|
|
return 0;
|
2017-02-10 23:24:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer = x509_to_buffer(x509);
|
|
|
|
if (!buffer ||
|
|
|
|
!PushToStack(new_chain.get(), std::move(buffer))) {
|
|
|
|
return 0;
|
2017-02-10 23:24:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
cert->chain = std::move(new_chain);
|
2017-02-10 23:24:56 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
static void ssl_crypto_x509_cert_flush_cached_leaf(CERT *cert) {
|
2017-02-01 19:59:18 +00:00
|
|
|
X509_free(cert->x509_leaf);
|
|
|
|
cert->x509_leaf = NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
static void ssl_crypto_x509_cert_flush_cached_chain(CERT *cert) {
|
2017-02-01 19:59:18 +00:00
|
|
|
sk_X509_pop_free(cert->x509_chain, X509_free);
|
|
|
|
cert->x509_chain = NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-23 23:02:58 +00:00
|
|
|
static int ssl_crypto_x509_check_client_CA_list(
|
|
|
|
STACK_OF(CRYPTO_BUFFER) *names) {
|
2017-07-26 03:36:00 +01:00
|
|
|
for (const CRYPTO_BUFFER *buffer : names) {
|
2017-02-23 23:02:58 +00:00
|
|
|
const uint8_t *inp = CRYPTO_BUFFER_data(buffer);
|
2018-07-14 18:27:25 +01:00
|
|
|
UniquePtr<X509_NAME> name(
|
|
|
|
d2i_X509_NAME(nullptr, &inp, CRYPTO_BUFFER_len(buffer)));
|
|
|
|
if (name == nullptr ||
|
|
|
|
inp != CRYPTO_BUFFER_data(buffer) + CRYPTO_BUFFER_len(buffer)) {
|
2017-02-23 23:02:58 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
static void ssl_crypto_x509_cert_clear(CERT *cert) {
|
|
|
|
ssl_crypto_x509_cert_flush_cached_leaf(cert);
|
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(cert);
|
2017-02-01 19:59:18 +00:00
|
|
|
|
|
|
|
X509_free(cert->x509_stash);
|
|
|
|
cert->x509_stash = NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
static void ssl_crypto_x509_cert_free(CERT *cert) {
|
|
|
|
ssl_crypto_x509_cert_clear(cert);
|
2017-02-10 21:56:48 +00:00
|
|
|
X509_STORE_free(cert->verify_store);
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
static void ssl_crypto_x509_cert_dup(CERT *new_cert, const CERT *cert) {
|
2017-02-10 21:56:48 +00:00
|
|
|
if (cert->verify_store != NULL) {
|
|
|
|
X509_STORE_up_ref(cert->verify_store);
|
|
|
|
new_cert->verify_store = cert->verify_store;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-01 23:49:37 +00:00
|
|
|
static int ssl_crypto_x509_session_cache_objects(SSL_SESSION *sess) {
|
2017-07-09 21:17:55 +01:00
|
|
|
bssl::UniquePtr<STACK_OF(X509)> chain;
|
Give SSL_SESSION a destructor.
Previously we'd partially attempted the ssl_st / bssl::SSLConnection
subclassing split, but that gets messy when we actually try to add a
destructor, because CRYPTO_EX_DATA's cleanup function needs an ssl_st*,
not a bssl::SSLConnection*. Downcasting is technically undefined at this
point and will likely offend some CFI-like check.
Moreover, it appears that even with today's subclassing split,
New<SSL>() emits symbols like:
W ssl_st*& std::forward<ssl_st*&>(std::remove_reference<ssl_st*&>::type&)
The compiler does not bother emitting them in optimized builds, but it
does suggest we can't really avoid claiming the ssl_st type name at the
symbol level, short of doing reinterpret_casts at all API boundaries.
And, of course, we've already long claimed it at the #include level.
So I've just left this defining directly on ssl_session_st. The cost is
we need to write some silly "bssl::" prefixes in the headers, but so it
goes. In the likely event we change our minds again, we can always
revise this.
Change-Id: Ieb429e8eaabe7c2961ef7f8d9234fb71f19a5e2a
Reviewed-on: https://boringssl-review.googlesource.com/29587
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
2018-06-29 21:26:38 +01:00
|
|
|
if (sk_CRYPTO_BUFFER_num(sess->certs.get()) > 0) {
|
2017-07-09 21:17:55 +01:00
|
|
|
chain.reset(sk_X509_new_null());
|
|
|
|
if (!chain) {
|
2017-02-01 23:49:37 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
2017-07-09 21:17:55 +01:00
|
|
|
return 0;
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
X509 *leaf = nullptr;
|
Give SSL_SESSION a destructor.
Previously we'd partially attempted the ssl_st / bssl::SSLConnection
subclassing split, but that gets messy when we actually try to add a
destructor, because CRYPTO_EX_DATA's cleanup function needs an ssl_st*,
not a bssl::SSLConnection*. Downcasting is technically undefined at this
point and will likely offend some CFI-like check.
Moreover, it appears that even with today's subclassing split,
New<SSL>() emits symbols like:
W ssl_st*& std::forward<ssl_st*&>(std::remove_reference<ssl_st*&>::type&)
The compiler does not bother emitting them in optimized builds, but it
does suggest we can't really avoid claiming the ssl_st type name at the
symbol level, short of doing reinterpret_casts at all API boundaries.
And, of course, we've already long claimed it at the #include level.
So I've just left this defining directly on ssl_session_st. The cost is
we need to write some silly "bssl::" prefixes in the headers, but so it
goes. In the likely event we change our minds again, we can always
revise this.
Change-Id: Ieb429e8eaabe7c2961ef7f8d9234fb71f19a5e2a
Reviewed-on: https://boringssl-review.googlesource.com/29587
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
2018-06-29 21:26:38 +01:00
|
|
|
for (CRYPTO_BUFFER *cert : sess->certs.get()) {
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<X509> x509(X509_parse_from_buffer(cert));
|
|
|
|
if (!x509) {
|
2017-02-01 23:49:37 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, SSL_R_DECODE_ERROR);
|
2017-07-09 21:17:55 +01:00
|
|
|
return 0;
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
2017-07-26 03:36:00 +01:00
|
|
|
if (leaf == nullptr) {
|
|
|
|
leaf = x509.get();
|
|
|
|
}
|
|
|
|
if (!PushToStack(chain.get(), std::move(x509))) {
|
2017-02-01 23:49:37 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
2017-07-09 21:17:55 +01:00
|
|
|
return 0;
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sk_X509_pop_free(sess->x509_chain, X509_free);
|
2017-07-09 21:17:55 +01:00
|
|
|
sess->x509_chain = chain.release();
|
2017-02-01 23:49:37 +00:00
|
|
|
sk_X509_pop_free(sess->x509_chain_without_leaf, X509_free);
|
|
|
|
sess->x509_chain_without_leaf = NULL;
|
|
|
|
|
|
|
|
X509_free(sess->x509_peer);
|
|
|
|
if (leaf != NULL) {
|
|
|
|
X509_up_ref(leaf);
|
|
|
|
}
|
|
|
|
sess->x509_peer = leaf;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_crypto_x509_session_dup(SSL_SESSION *new_session,
|
|
|
|
const SSL_SESSION *session) {
|
|
|
|
if (session->x509_peer != NULL) {
|
|
|
|
X509_up_ref(session->x509_peer);
|
|
|
|
new_session->x509_peer = session->x509_peer;
|
|
|
|
}
|
|
|
|
if (session->x509_chain != NULL) {
|
|
|
|
new_session->x509_chain = X509_chain_up_ref(session->x509_chain);
|
|
|
|
if (new_session->x509_chain == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ssl_crypto_x509_session_clear(SSL_SESSION *session) {
|
|
|
|
X509_free(session->x509_peer);
|
|
|
|
session->x509_peer = NULL;
|
|
|
|
sk_X509_pop_free(session->x509_chain, X509_free);
|
|
|
|
session->x509_chain = NULL;
|
|
|
|
sk_X509_pop_free(session->x509_chain_without_leaf, X509_free);
|
|
|
|
session->x509_chain_without_leaf = NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-10 21:56:48 +00:00
|
|
|
static int ssl_crypto_x509_session_verify_cert_chain(SSL_SESSION *session,
|
2018-04-13 23:51:30 +01:00
|
|
|
SSL_HANDSHAKE *hs,
|
2017-07-11 21:13:10 +01:00
|
|
|
uint8_t *out_alert) {
|
|
|
|
*out_alert = SSL_AD_INTERNAL_ERROR;
|
2017-02-10 21:56:48 +00:00
|
|
|
STACK_OF(X509) *const cert_chain = session->x509_chain;
|
|
|
|
if (cert_chain == NULL || sk_X509_num(cert_chain) == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-03 00:47:27 +01:00
|
|
|
SSL_CTX *ssl_ctx = hs->ssl->ctx.get();
|
2018-04-13 23:51:30 +01:00
|
|
|
X509_STORE *verify_store = ssl_ctx->cert_store;
|
|
|
|
if (hs->config->cert->verify_store != NULL) {
|
|
|
|
verify_store = hs->config->cert->verify_store;
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
X509 *leaf = sk_X509_value(cert_chain, 0);
|
2017-08-02 22:16:31 +01:00
|
|
|
ScopedX509_STORE_CTX ctx;
|
|
|
|
if (!X509_STORE_CTX_init(ctx.get(), verify_store, leaf, cert_chain)) {
|
2017-02-10 21:56:48 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_X509_LIB);
|
|
|
|
return 0;
|
|
|
|
}
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!X509_STORE_CTX_set_ex_data(
|
|
|
|
ctx.get(), SSL_get_ex_data_X509_STORE_CTX_idx(), hs->ssl)) {
|
2017-08-02 22:16:31 +01:00
|
|
|
return 0;
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// We need to inherit the verify parameters. These can be determined by the
|
|
|
|
// context: if its a server it will verify SSL client certificates or vice
|
|
|
|
// versa.
|
2017-08-02 22:16:31 +01:00
|
|
|
X509_STORE_CTX_set_default(ctx.get(),
|
2018-04-13 23:51:30 +01:00
|
|
|
hs->ssl->server ? "ssl_client" : "ssl_server");
|
2017-02-10 21:56:48 +00:00
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// Anything non-default in "param" should overwrite anything in the ctx.
|
2018-04-13 23:51:30 +01:00
|
|
|
X509_VERIFY_PARAM_set1(X509_STORE_CTX_get0_param(ctx.get()),
|
|
|
|
hs->config->param);
|
2017-02-10 21:56:48 +00:00
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
if (hs->config->verify_callback) {
|
|
|
|
X509_STORE_CTX_set_verify_cb(ctx.get(), hs->config->verify_callback);
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int verify_ret;
|
2018-04-13 23:51:30 +01:00
|
|
|
if (ssl_ctx->app_verify_callback != NULL) {
|
2017-08-02 22:16:31 +01:00
|
|
|
verify_ret =
|
2018-04-13 23:51:30 +01:00
|
|
|
ssl_ctx->app_verify_callback(ctx.get(), ssl_ctx->app_verify_arg);
|
2017-02-10 21:56:48 +00:00
|
|
|
} else {
|
2017-08-02 22:16:31 +01:00
|
|
|
verify_ret = X509_verify_cert(ctx.get());
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
2017-08-02 22:16:31 +01:00
|
|
|
session->verify_result = ctx->error;
|
2017-02-10 21:56:48 +00:00
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// If |SSL_VERIFY_NONE|, the error is non-fatal, but we keep the result.
|
2018-04-13 23:51:30 +01:00
|
|
|
if (verify_ret <= 0 && hs->config->verify_mode != SSL_VERIFY_NONE) {
|
2018-01-03 17:43:50 +00:00
|
|
|
*out_alert = SSL_alert_from_verify_result(ctx->error);
|
2017-08-02 22:16:31 +01:00
|
|
|
return 0;
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ERR_clear_error();
|
2017-08-02 22:16:31 +01:00
|
|
|
return 1;
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
2017-02-02 18:57:17 +00:00
|
|
|
static void ssl_crypto_x509_hs_flush_cached_ca_names(SSL_HANDSHAKE *hs) {
|
|
|
|
sk_X509_NAME_pop_free(hs->cached_x509_ca_names, X509_NAME_free);
|
|
|
|
hs->cached_x509_ca_names = NULL;
|
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
static int ssl_crypto_x509_ssl_new(SSL_HANDSHAKE *hs) {
|
|
|
|
hs->config->param = X509_VERIFY_PARAM_new();
|
|
|
|
if (hs->config->param == NULL) {
|
2017-02-10 21:56:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2018-04-13 23:51:30 +01:00
|
|
|
X509_VERIFY_PARAM_inherit(hs->config->param, hs->ssl->ctx->param);
|
2017-02-10 21:56:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
static void ssl_crypto_x509_ssl_flush_cached_client_CA(SSL_CONFIG *cfg) {
|
|
|
|
sk_X509_NAME_pop_free(cfg->cached_x509_client_CA, X509_NAME_free);
|
|
|
|
cfg->cached_x509_client_CA = NULL;
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
static void ssl_crypto_x509_ssl_config_free(SSL_CONFIG *cfg) {
|
|
|
|
sk_X509_NAME_pop_free(cfg->cached_x509_client_CA, X509_NAME_free);
|
|
|
|
cfg->cached_x509_client_CA = NULL;
|
|
|
|
X509_VERIFY_PARAM_free(cfg->param);
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
static int ssl_crypto_x509_ssl_auto_chain_if_needed(SSL_HANDSHAKE *hs) {
|
2017-08-29 21:33:21 +01:00
|
|
|
// Only build a chain if there are no intermediates configured and the feature
|
|
|
|
// isn't disabled.
|
2018-04-13 23:51:30 +01:00
|
|
|
if ((hs->ssl->mode & SSL_MODE_NO_AUTO_CHAIN) ||
|
|
|
|
!ssl_has_certificate(hs->config) || hs->config->cert->chain == NULL ||
|
|
|
|
sk_CRYPTO_BUFFER_num(hs->config->cert->chain.get()) > 1) {
|
2017-02-10 23:24:56 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
UniquePtr<X509> leaf(X509_parse_from_buffer(
|
2018-04-13 23:51:30 +01:00
|
|
|
sk_CRYPTO_BUFFER_value(hs->config->cert->chain.get(), 0)));
|
2017-02-10 23:24:56 +00:00
|
|
|
if (!leaf) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_X509_LIB);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-08-02 22:16:31 +01:00
|
|
|
ScopedX509_STORE_CTX ctx;
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!X509_STORE_CTX_init(ctx.get(), hs->ssl->ctx->cert_store, leaf.get(),
|
|
|
|
NULL)) {
|
2017-02-10 23:24:56 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_X509_LIB);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// Attempt to build a chain, ignoring the result.
|
2017-08-02 22:16:31 +01:00
|
|
|
X509_verify_cert(ctx.get());
|
2017-02-10 23:24:56 +00:00
|
|
|
ERR_clear_error();
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// Remove the leaf from the generated chain.
|
2017-08-02 22:16:31 +01:00
|
|
|
X509_free(sk_X509_shift(ctx->chain));
|
2017-02-10 23:24:56 +00:00
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
if (!ssl_cert_set_chain(hs->config->cert.get(), ctx->chain)) {
|
2017-02-10 23:24:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(hs->config->cert.get());
|
2017-02-10 23:24:56 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-02-02 18:57:17 +00:00
|
|
|
static void ssl_crypto_x509_ssl_ctx_flush_cached_client_CA(SSL_CTX *ctx) {
|
|
|
|
sk_X509_NAME_pop_free(ctx->cached_x509_client_CA, X509_NAME_free);
|
|
|
|
ctx->cached_x509_client_CA = NULL;
|
|
|
|
}
|
|
|
|
|
2017-02-10 21:56:48 +00:00
|
|
|
static int ssl_crypto_x509_ssl_ctx_new(SSL_CTX *ctx) {
|
|
|
|
ctx->cert_store = X509_STORE_new();
|
|
|
|
ctx->param = X509_VERIFY_PARAM_new();
|
|
|
|
return (ctx->cert_store != NULL && ctx->param != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ssl_crypto_x509_ssl_ctx_free(SSL_CTX *ctx) {
|
|
|
|
ssl_crypto_x509_ssl_ctx_flush_cached_client_CA(ctx);
|
|
|
|
X509_VERIFY_PARAM_free(ctx->param);
|
|
|
|
X509_STORE_free(ctx->cert_store);
|
|
|
|
}
|
|
|
|
|
2017-02-01 19:59:18 +00:00
|
|
|
const SSL_X509_METHOD ssl_crypto_x509_method = {
|
2017-02-23 23:02:58 +00:00
|
|
|
ssl_crypto_x509_check_client_CA_list,
|
2017-02-28 18:38:40 +00:00
|
|
|
ssl_crypto_x509_cert_clear,
|
|
|
|
ssl_crypto_x509_cert_free,
|
|
|
|
ssl_crypto_x509_cert_dup,
|
|
|
|
ssl_crypto_x509_cert_flush_cached_chain,
|
|
|
|
ssl_crypto_x509_cert_flush_cached_leaf,
|
2017-02-01 23:49:37 +00:00
|
|
|
ssl_crypto_x509_session_cache_objects,
|
|
|
|
ssl_crypto_x509_session_dup,
|
|
|
|
ssl_crypto_x509_session_clear,
|
2017-02-10 21:56:48 +00:00
|
|
|
ssl_crypto_x509_session_verify_cert_chain,
|
2017-02-02 18:57:17 +00:00
|
|
|
ssl_crypto_x509_hs_flush_cached_ca_names,
|
2017-02-10 21:56:48 +00:00
|
|
|
ssl_crypto_x509_ssl_new,
|
2018-04-13 23:51:30 +01:00
|
|
|
ssl_crypto_x509_ssl_config_free,
|
2017-02-02 18:57:17 +00:00
|
|
|
ssl_crypto_x509_ssl_flush_cached_client_CA,
|
2017-02-10 23:24:56 +00:00
|
|
|
ssl_crypto_x509_ssl_auto_chain_if_needed,
|
2017-02-10 21:56:48 +00:00
|
|
|
ssl_crypto_x509_ssl_ctx_new,
|
|
|
|
ssl_crypto_x509_ssl_ctx_free,
|
2017-02-02 18:57:17 +00:00
|
|
|
ssl_crypto_x509_ssl_ctx_flush_cached_client_CA,
|
2017-02-01 19:59:18 +00:00
|
|
|
};
|
|
|
|
|
Support symbol prefixes
- In base.h, if BORINGSSL_PREFIX is defined, include
boringssl_prefix_symbols.h
- In all .S files, if BORINGSSL_PREFIX is defined, include
boringssl_prefix_symbols_asm.h
- In base.h, BSSL_NAMESPACE_BEGIN and BSSL_NAMESPACE_END are
defined with appropriate values depending on whether
BORINGSSL_PREFIX is defined; these macros are used in place
of 'namespace bssl {' and '}'
- Add util/make_prefix_headers.go, which takes a list of symbols
and auto-generates the header files mentioned above
- In CMakeLists.txt, if BORINGSSL_PREFIX and BORINGSSL_PREFIX_SYMBOLS
are defined, run util/make_prefix_headers.go to generate header
files
- In various CMakeLists.txt files, add "global_target" that all
targets depend on to give us a place to hook logic that must run
before all other targets (in particular, the header file generation
logic)
- Document this in BUILDING.md, including the fact that it is
the caller's responsibility to provide the symbol list and keep it
up to date
- Note that this scheme has not been tested on Windows, and likely
does not work on it; Windows support will need to be added in a
future commit
Change-Id: If66a7157f46b5b66230ef91e15826b910cf979a2
Reviewed-on: https://boringssl-review.googlesource.com/31364
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: David Benjamin <davidben@google.com>
2018-08-27 02:53:36 +01:00
|
|
|
BSSL_NAMESPACE_END
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
|
|
|
|
using namespace bssl;
|
|
|
|
|
|
|
|
X509 *SSL_get_peer_certificate(const SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
|
|
|
if (ssl == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
SSL_SESSION *session = SSL_get_session(ssl);
|
|
|
|
if (session == NULL || session->x509_peer == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
X509_up_ref(session->x509_peer);
|
|
|
|
return session->x509_peer;
|
|
|
|
}
|
|
|
|
|
|
|
|
STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
|
|
|
if (ssl == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
SSL_SESSION *session = SSL_get_session(ssl);
|
|
|
|
if (session == NULL ||
|
|
|
|
session->x509_chain == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ssl->server) {
|
|
|
|
return session->x509_chain;
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// OpenSSL historically didn't include the leaf certificate in the returned
|
|
|
|
// certificate chain, but only for servers.
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
if (session->x509_chain_without_leaf == NULL) {
|
|
|
|
session->x509_chain_without_leaf = sk_X509_new_null();
|
|
|
|
if (session->x509_chain_without_leaf == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (size_t i = 1; i < sk_X509_num(session->x509_chain); i++) {
|
|
|
|
X509 *cert = sk_X509_value(session->x509_chain, i);
|
2018-06-29 22:46:42 +01:00
|
|
|
if (!PushToStack(session->x509_chain_without_leaf, UpRef(cert))) {
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
sk_X509_pop_free(session->x509_chain_without_leaf, X509_free);
|
|
|
|
session->x509_chain_without_leaf = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return session->x509_chain_without_leaf;
|
|
|
|
}
|
|
|
|
|
|
|
|
STACK_OF(X509) *SSL_get_peer_full_cert_chain(const SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
|
|
|
SSL_SESSION *session = SSL_get_session(ssl);
|
|
|
|
if (session == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return session->x509_chain;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set_purpose(SSL_CTX *ctx, int purpose) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_VERIFY_PARAM_set_purpose(ctx->param, purpose);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set_purpose(SSL *ssl, int purpose) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return X509_VERIFY_PARAM_set_purpose(ssl->config->param, purpose);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set_trust(SSL_CTX *ctx, int trust) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_VERIFY_PARAM_set_trust(ctx->param, trust);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set_trust(SSL *ssl, int trust) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return X509_VERIFY_PARAM_set_trust(ssl->config->param, trust);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set1_param(SSL_CTX *ctx, const X509_VERIFY_PARAM *param) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_VERIFY_PARAM_set1(ctx->param, param);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set1_param(SSL *ssl, const X509_VERIFY_PARAM *param) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return X509_VERIFY_PARAM_set1(ssl->config->param, param);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return ctx->param;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return ssl->config->param;
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_get_verify_depth(const SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return X509_VERIFY_PARAM_get_depth(ssl->config->param);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int (*SSL_get_verify_callback(const SSL *ssl))(int, X509_STORE_CTX *) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return ssl->config->verify_callback;
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_get_verify_mode(const SSL_CTX *ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return ctx->verify_mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_get_verify_depth(const SSL_CTX *ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_VERIFY_PARAM_get_depth(ctx->param);
|
|
|
|
}
|
|
|
|
|
|
|
|
int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx))(
|
|
|
|
int ok, X509_STORE_CTX *store_ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return ctx->default_verify_callback;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_set_verify(SSL *ssl, int mode,
|
|
|
|
int (*callback)(int ok, X509_STORE_CTX *store_ctx)) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ssl->config->verify_mode = mode;
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
if (callback != NULL) {
|
2018-04-13 23:51:30 +01:00
|
|
|
ssl->config->verify_callback = callback;
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_set_verify_depth(SSL *ssl, int depth) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
X509_VERIFY_PARAM_set_depth(ssl->config->param, depth);
|
Move libssl's internals into the bssl namespace.
This is horrible, but everything else I tried was worse. The goal with
this CL is to take the extern "C" out of ssl/internal.h and move most
symbols to namespace bssl, so we can start using C++ helpers and
destructors without worry.
Complications:
- Public API functions must be extern "C" and match their declaration in
ssl.h, which is unnamespaced. C++ really does not want you to
interleave namespaced and unnamespaced things. One can actually write
a namespaced extern "C" function, but this means, from C++'s
perspective, the function is namespaced. Trying to namespace the
public header would worked but ended up too deep a rabbithole.
- Our STACK_OF macros do not work right in namespaces.
- The typedefs for our exposed but opaque types are visible in the
header files and copied into consuming projects as forward
declarations. We ultimately want to give SSL a destructor, but
clobbering an unnamespaced ssl_st::~ssl_st seems bad manners.
- MSVC complains about ambiguous names if one typedefs SSL to bssl::SSL.
This CL opts for:
- ssl/*.cc must begin with #define BORINGSSL_INTERNAL_CXX_TYPES. This
informs the public headers to create forward declarations which are
compatible with our namespaces.
- For now, C++-defined type FOO ends up at bssl::FOO with a typedef
outside. Later I imagine we'll rename many of them.
- Internal functions get namespace bssl, so we stop worrying about
stomping the tls1_prf symbol. Exported C functions are stuck as they
are. Rather than try anything weird, bite the bullet and reorder files
which have a mix of public and private functions. I expect that over
time, the public functions will become fairly small as we move logic
to more idiomatic C++.
Files without any public C functions can just be written normally.
- To avoid MSVC troubles, some bssl types are renamed to CPlusPlusStyle
in advance of them being made idiomatic C++.
Bug: 132
Change-Id: Ic931895e117c38b14ff8d6e5a273e868796c7581
Reviewed-on: https://boringssl-review.googlesource.com/18124
Reviewed-by: David Benjamin <davidben@google.com>
2017-07-18 21:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
|
|
|
|
int (*cb)(X509_STORE_CTX *store_ctx,
|
|
|
|
void *arg),
|
|
|
|
void *arg) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
ctx->app_verify_callback = cb;
|
|
|
|
ctx->app_verify_arg = arg;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
|
|
|
|
int (*cb)(int, X509_STORE_CTX *)) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
ctx->verify_mode = mode;
|
|
|
|
ctx->default_verify_callback = cb;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
X509_VERIFY_PARAM_set_depth(ctx->param, depth);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_STORE_set_default_paths(ctx->cert_store);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *ca_file,
|
|
|
|
const char *ca_dir) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return X509_STORE_load_locations(ctx->cert_store, ca_file, ca_dir);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_set_verify_result(SSL *ssl, long result) {
|
|
|
|
check_ssl_x509_method(ssl);
|
|
|
|
if (result != X509_V_OK) {
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
long SSL_get_verify_result(const SSL *ssl) {
|
|
|
|
check_ssl_x509_method(ssl);
|
|
|
|
SSL_SESSION *session = SSL_get_session(ssl);
|
|
|
|
if (session == NULL) {
|
|
|
|
return X509_V_ERR_INVALID_CALL;
|
|
|
|
}
|
|
|
|
return session->verify_result;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *ctx) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return ctx->cert_store;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_cert_store(SSL_CTX *ctx, X509_STORE *store) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
X509_STORE_free(ctx->cert_store);
|
|
|
|
ctx->cert_store = store;
|
|
|
|
}
|
|
|
|
|
2017-02-01 19:59:18 +00:00
|
|
|
static int ssl_use_certificate(CERT *cert, X509 *x) {
|
|
|
|
if (x == NULL) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer = x509_to_buffer(x);
|
|
|
|
if (!buffer) {
|
2017-02-01 19:59:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
return ssl_set_cert(cert, std::move(buffer));
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_use_certificate(SSL *ssl, X509 *x) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_use_certificate(ssl->config->cert.get(), x);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_use_certificate(ctx->cert.get(), x);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// ssl_cert_cache_leaf_cert sets |cert->x509_leaf|, if currently NULL, from the
|
|
|
|
// first element of |cert->chain|.
|
2017-02-01 19:59:18 +00:00
|
|
|
static int ssl_cert_cache_leaf_cert(CERT *cert) {
|
|
|
|
assert(cert->x509_method);
|
|
|
|
|
|
|
|
if (cert->x509_leaf != NULL ||
|
|
|
|
cert->chain == NULL) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
CRYPTO_BUFFER *leaf = sk_CRYPTO_BUFFER_value(cert->chain.get(), 0);
|
2017-02-01 19:59:18 +00:00
|
|
|
if (!leaf) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
cert->x509_leaf = X509_parse_from_buffer(leaf);
|
|
|
|
return cert->x509_leaf != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static X509 *ssl_cert_get0_leaf(CERT *cert) {
|
|
|
|
if (cert->x509_leaf == NULL &&
|
|
|
|
!ssl_cert_cache_leaf_cert(cert)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cert->x509_leaf;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509 *SSL_get_certificate(const SSL *ssl) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_get0_leaf(ssl->config->cert.get());
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
X509 *SSL_CTX_get0_certificate(const SSL_CTX *ctx) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-09-27 22:28:10 +01:00
|
|
|
MutexWriteLock lock(const_cast<CRYPTO_MUTEX*>(&ctx->lock));
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_get0_leaf(ctx->cert.get());
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_cert_set0_chain(CERT *cert, STACK_OF(X509) *chain) {
|
|
|
|
if (!ssl_cert_set_chain(cert, chain)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
sk_X509_pop_free(chain, X509_free);
|
2017-02-28 18:38:40 +00:00
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(cert);
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_cert_set1_chain(CERT *cert, STACK_OF(X509) *chain) {
|
|
|
|
if (!ssl_cert_set_chain(cert, chain)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(cert);
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_cert_append_cert(CERT *cert, X509 *x509) {
|
|
|
|
assert(cert->x509_method);
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer = x509_to_buffer(x509);
|
|
|
|
if (!buffer) {
|
2017-02-01 19:59:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cert->chain != NULL) {
|
2018-04-12 21:11:15 +01:00
|
|
|
return PushToStack(cert->chain.get(), std::move(buffer));
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
cert->chain = new_leafless_chain();
|
2018-04-12 21:11:15 +01:00
|
|
|
if (!cert->chain ||
|
|
|
|
!PushToStack(cert->chain.get(), std::move(buffer))) {
|
|
|
|
cert->chain.reset();
|
2017-02-01 19:59:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_cert_add0_chain_cert(CERT *cert, X509 *x509) {
|
|
|
|
if (!ssl_cert_append_cert(cert, x509)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509_free(cert->x509_stash);
|
|
|
|
cert->x509_stash = x509;
|
2017-02-28 18:38:40 +00:00
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(cert);
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ssl_cert_add1_chain_cert(CERT *cert, X509 *x509) {
|
|
|
|
if (!ssl_cert_append_cert(cert, x509)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-28 18:38:40 +00:00
|
|
|
ssl_crypto_x509_cert_flush_cached_chain(cert);
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set0_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_set0_chain(ctx->cert.get(), chain);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set1_chain(SSL_CTX *ctx, STACK_OF(X509) *chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_set1_chain(ctx->cert.get(), chain);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set0_chain(SSL *ssl, STACK_OF(X509) *chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_set0_chain(ssl->config->cert.get(), chain);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set1_chain(SSL *ssl, STACK_OF(X509) *chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_set1_chain(ssl->config->cert.get(), chain);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_add0_chain_cert(SSL_CTX *ctx, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_add0_chain_cert(ctx->cert.get(), x509);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_add1_chain_cert(SSL_CTX *ctx, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_add1_chain_cert(ctx->cert.get(), x509);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_add_extra_chain_cert(SSL_CTX *ctx, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-02-01 19:59:18 +00:00
|
|
|
return SSL_CTX_add0_chain_cert(ctx, x509);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_add0_chain_cert(SSL *ssl, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_add0_chain_cert(ssl->config->cert.get(), x509);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_add1_chain_cert(SSL *ssl, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
return ssl_cert_add1_chain_cert(ssl->config->cert.get(), x509);
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_clear_chain_certs(SSL_CTX *ctx) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-02-01 19:59:18 +00:00
|
|
|
return SSL_CTX_set0_chain(ctx, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_clear_extra_chain_certs(SSL_CTX *ctx) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-02-01 19:59:18 +00:00
|
|
|
return SSL_CTX_clear_chain_certs(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_clear_chain_certs(SSL *ssl) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2017-02-01 19:59:18 +00:00
|
|
|
return SSL_set0_chain(ssl, NULL);
|
|
|
|
}
|
|
|
|
|
2017-08-29 21:33:21 +01:00
|
|
|
// ssl_cert_cache_chain_certs fills in |cert->x509_chain| from elements 1.. of
|
|
|
|
// |cert->chain|.
|
2017-02-01 19:59:18 +00:00
|
|
|
static int ssl_cert_cache_chain_certs(CERT *cert) {
|
|
|
|
assert(cert->x509_method);
|
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
if (cert->x509_chain != nullptr ||
|
2018-04-23 19:56:21 +01:00
|
|
|
cert->chain == nullptr ||
|
2018-04-12 21:11:15 +01:00
|
|
|
sk_CRYPTO_BUFFER_num(cert->chain.get()) < 2) {
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<STACK_OF(X509)> chain(sk_X509_new_null());
|
|
|
|
if (!chain) {
|
2017-02-01 19:59:18 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-04-12 21:11:15 +01:00
|
|
|
for (size_t i = 1; i < sk_CRYPTO_BUFFER_num(cert->chain.get()); i++) {
|
|
|
|
CRYPTO_BUFFER *buffer = sk_CRYPTO_BUFFER_value(cert->chain.get(), i);
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<X509> x509(X509_parse_from_buffer(buffer));
|
|
|
|
if (!x509 ||
|
|
|
|
!PushToStack(chain.get(), std::move(x509))) {
|
|
|
|
return 0;
|
2017-02-01 19:59:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
cert->x509_chain = chain.release();
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_get0_chain_certs(const SSL_CTX *ctx, STACK_OF(X509) **out_chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-09-27 22:28:10 +01:00
|
|
|
MutexWriteLock lock(const_cast<CRYPTO_MUTEX*>(&ctx->lock));
|
2018-07-03 01:24:40 +01:00
|
|
|
if (!ssl_cert_cache_chain_certs(ctx->cert.get())) {
|
2017-02-01 19:59:18 +00:00
|
|
|
*out_chain = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
*out_chain = ctx->cert->x509_chain;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_get_extra_chain_certs(const SSL_CTX *ctx,
|
|
|
|
STACK_OF(X509) **out_chain) {
|
|
|
|
return SSL_CTX_get0_chain_certs(ctx, out_chain);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_get0_chain_certs(const SSL *ssl, STACK_OF(X509) **out_chain) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return 0;
|
|
|
|
}
|
2018-07-03 01:24:40 +01:00
|
|
|
if (!ssl_cert_cache_chain_certs(ssl->config->cert.get())) {
|
2017-02-01 19:59:18 +00:00
|
|
|
*out_chain = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
*out_chain = ssl->config->cert->x509_chain;
|
2017-02-01 19:59:18 +00:00
|
|
|
return 1;
|
|
|
|
}
|
2017-02-01 23:49:37 +00:00
|
|
|
|
|
|
|
SSL_SESSION *d2i_SSL_SESSION_bio(BIO *bio, SSL_SESSION **out) {
|
2018-09-23 01:35:12 +01:00
|
|
|
uint8_t *data;
|
|
|
|
size_t len;
|
|
|
|
if (!BIO_read_asn1(bio, &data, &len, 1024 * 1024)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
bssl::UniquePtr<uint8_t> free_data(data);
|
|
|
|
const uint8_t *ptr = data;
|
|
|
|
return d2i_SSL_SESSION(out, &ptr, static_cast<long>(len));
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int i2d_SSL_SESSION_bio(BIO *bio, const SSL_SESSION *session) {
|
2018-09-23 01:35:12 +01:00
|
|
|
uint8_t *data;
|
|
|
|
size_t len;
|
|
|
|
if (!SSL_SESSION_to_bytes(session, &data, &len)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
bssl::UniquePtr<uint8_t> free_data(data);
|
|
|
|
return BIO_write_all(bio, data, len);
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
IMPLEMENT_PEM_rw(SSL_SESSION, SSL_SESSION, PEM_STRING_SSL_SESSION, SSL_SESSION)
|
|
|
|
|
|
|
|
SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const uint8_t **pp, long length) {
|
|
|
|
if (length < 0) {
|
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
CBS cbs;
|
|
|
|
CBS_init(&cbs, *pp, length);
|
|
|
|
|
2017-07-20 19:49:15 +01:00
|
|
|
UniquePtr<SSL_SESSION> ret = SSL_SESSION_parse(&cbs, &ssl_crypto_x509_method,
|
|
|
|
NULL /* no buffer pool */);
|
|
|
|
if (!ret) {
|
2017-02-01 23:49:37 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a) {
|
|
|
|
SSL_SESSION_free(*a);
|
2017-07-20 19:49:15 +01:00
|
|
|
*a = ret.get();
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
|
|
|
*pp = CBS_data(&cbs);
|
2017-07-20 19:49:15 +01:00
|
|
|
return ret.release();
|
2017-02-01 23:49:37 +00:00
|
|
|
}
|
2017-02-02 18:57:17 +00:00
|
|
|
|
|
|
|
STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *list) {
|
|
|
|
return sk_X509_NAME_deep_copy(list, X509_NAME_dup, X509_NAME_free);
|
|
|
|
}
|
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
static void set_client_CA_list(UniquePtr<STACK_OF(CRYPTO_BUFFER)> *ca_list,
|
2017-02-02 18:57:17 +00:00
|
|
|
const STACK_OF(X509_NAME) *name_list,
|
|
|
|
CRYPTO_BUFFER_POOL *pool) {
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<STACK_OF(CRYPTO_BUFFER)> buffers(sk_CRYPTO_BUFFER_new_null());
|
|
|
|
if (!buffers) {
|
2017-02-02 18:57:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
for (X509_NAME *name : name_list) {
|
2017-02-02 18:57:17 +00:00
|
|
|
uint8_t *outp = NULL;
|
|
|
|
int len = i2d_X509_NAME(name, &outp);
|
|
|
|
if (len < 0) {
|
2017-07-26 03:36:00 +01:00
|
|
|
return;
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer(CRYPTO_BUFFER_new(outp, len, pool));
|
2017-02-02 18:57:17 +00:00
|
|
|
OPENSSL_free(outp);
|
2017-07-26 03:36:00 +01:00
|
|
|
if (!buffer ||
|
|
|
|
!PushToStack(buffers.get(), std::move(buffer))) {
|
|
|
|
return;
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
*ca_list = std::move(buffers);
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_set_client_CA_list(SSL *ssl, STACK_OF(X509_NAME) *name_list) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return;
|
|
|
|
}
|
2018-07-03 00:47:27 +01:00
|
|
|
ssl->ctx->x509_method->ssl_flush_cached_client_CA(ssl->config.get());
|
2018-04-13 23:51:30 +01:00
|
|
|
set_client_CA_list(&ssl->config->client_CA, name_list, ssl->ctx->pool);
|
2017-02-02 18:57:17 +00:00
|
|
|
sk_X509_NAME_pop_free(name_list, X509_NAME_free);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-02-02 18:57:17 +00:00
|
|
|
ctx->x509_method->ssl_ctx_flush_cached_client_CA(ctx);
|
|
|
|
set_client_CA_list(&ctx->client_CA, name_list, ctx->pool);
|
|
|
|
sk_X509_NAME_pop_free(name_list, X509_NAME_free);
|
|
|
|
}
|
|
|
|
|
|
|
|
static STACK_OF(X509_NAME) *
|
|
|
|
buffer_names_to_x509(const STACK_OF(CRYPTO_BUFFER) *names,
|
|
|
|
STACK_OF(X509_NAME) **cached) {
|
|
|
|
if (names == NULL) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*cached != NULL) {
|
|
|
|
return *cached;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<STACK_OF(X509_NAME)> new_cache(sk_X509_NAME_new_null());
|
|
|
|
if (!new_cache) {
|
2017-02-02 18:57:17 +00:00
|
|
|
OPENSSL_PUT_ERROR(SSL, ERR_R_MALLOC_FAILURE);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
for (const CRYPTO_BUFFER *buffer : names) {
|
2017-02-02 18:57:17 +00:00
|
|
|
const uint8_t *inp = CRYPTO_BUFFER_data(buffer);
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<X509_NAME> name(
|
|
|
|
d2i_X509_NAME(nullptr, &inp, CRYPTO_BUFFER_len(buffer)));
|
|
|
|
if (!name ||
|
2017-02-02 18:57:17 +00:00
|
|
|
inp != CRYPTO_BUFFER_data(buffer) + CRYPTO_BUFFER_len(buffer) ||
|
2017-07-26 03:36:00 +01:00
|
|
|
!PushToStack(new_cache.get(), std::move(name))) {
|
|
|
|
return NULL;
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
*cached = new_cache.release();
|
|
|
|
return *cached;
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *ssl) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return NULL;
|
|
|
|
}
|
2017-08-29 21:33:21 +01:00
|
|
|
// For historical reasons, this function is used both to query configuration
|
|
|
|
// state on a server as well as handshake state on a client. However, whether
|
|
|
|
// |ssl| is a client or server is not known until explicitly configured with
|
|
|
|
// |SSL_set_connect_state|. If |do_handshake| is NULL, |ssl| is in an
|
|
|
|
// indeterminate mode and |ssl->server| is unset.
|
2017-08-14 20:08:34 +01:00
|
|
|
if (ssl->do_handshake != NULL && !ssl->server) {
|
2017-02-02 18:57:17 +00:00
|
|
|
if (ssl->s3->hs != NULL) {
|
2017-07-20 19:49:15 +01:00
|
|
|
return buffer_names_to_x509(ssl->s3->hs->ca_names.get(),
|
2017-02-02 18:57:17 +00:00
|
|
|
&ssl->s3->hs->cached_x509_ca_names);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-04-13 23:51:30 +01:00
|
|
|
if (ssl->config->client_CA != NULL) {
|
2017-02-02 18:57:17 +00:00
|
|
|
return buffer_names_to_x509(
|
2018-07-03 01:24:40 +01:00
|
|
|
ssl->config->client_CA.get(),
|
2018-04-13 23:51:30 +01:00
|
|
|
(STACK_OF(X509_NAME) **)&ssl->config->cached_x509_client_CA);
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
2018-07-03 00:47:27 +01:00
|
|
|
return SSL_CTX_get_client_CA_list(ssl->ctx.get());
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *ctx) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-08-29 21:33:21 +01:00
|
|
|
// This is a logically const operation that may be called on multiple threads,
|
|
|
|
// so it needs to lock around updating |cached_x509_client_CA|.
|
2017-09-27 22:28:10 +01:00
|
|
|
MutexWriteLock lock(const_cast<CRYPTO_MUTEX *>(&ctx->lock));
|
|
|
|
return buffer_names_to_x509(
|
2018-07-03 01:24:40 +01:00
|
|
|
ctx->client_CA.get(),
|
2017-09-27 22:28:10 +01:00
|
|
|
const_cast<STACK_OF(X509_NAME) **>(&ctx->cached_x509_client_CA));
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
static int add_client_CA(UniquePtr<STACK_OF(CRYPTO_BUFFER)> *names, X509 *x509,
|
2017-02-02 18:57:17 +00:00
|
|
|
CRYPTO_BUFFER_POOL *pool) {
|
|
|
|
if (x509 == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t *outp = NULL;
|
|
|
|
int len = i2d_X509_NAME(X509_get_subject_name(x509), &outp);
|
|
|
|
if (len < 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-26 03:36:00 +01:00
|
|
|
UniquePtr<CRYPTO_BUFFER> buffer(CRYPTO_BUFFER_new(outp, len, pool));
|
2017-02-02 18:57:17 +00:00
|
|
|
OPENSSL_free(outp);
|
2017-07-26 03:36:00 +01:00
|
|
|
if (!buffer) {
|
2017-02-02 18:57:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int alloced = 0;
|
2018-07-03 01:24:40 +01:00
|
|
|
if (*names == nullptr) {
|
|
|
|
names->reset(sk_CRYPTO_BUFFER_new_null());
|
2017-02-02 18:57:17 +00:00
|
|
|
alloced = 1;
|
|
|
|
|
|
|
|
if (*names == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-03 01:24:40 +01:00
|
|
|
if (!PushToStack(names->get(), std::move(buffer))) {
|
2017-02-02 18:57:17 +00:00
|
|
|
if (alloced) {
|
2018-07-03 01:24:40 +01:00
|
|
|
names->reset();
|
2017-02-02 18:57:17 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_add_client_CA(SSL *ssl, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!add_client_CA(&ssl->config->client_CA, x509, ssl->ctx->pool)) {
|
2017-02-02 18:57:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-03 00:47:27 +01:00
|
|
|
ssl_crypto_x509_ssl_flush_cached_client_CA(ssl->config.get());
|
2017-02-02 18:57:17 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x509) {
|
2017-02-10 21:30:23 +00:00
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-02-02 18:57:17 +00:00
|
|
|
if (!add_client_CA(&ctx->client_CA, x509, ctx->pool)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssl_crypto_x509_ssl_ctx_flush_cached_client_CA(ctx);
|
|
|
|
return 1;
|
|
|
|
}
|
2017-02-10 21:56:48 +00:00
|
|
|
|
|
|
|
static int do_client_cert_cb(SSL *ssl, void *arg) {
|
2018-04-13 23:51:30 +01:00
|
|
|
// Should only be called during handshake, but check to be sure.
|
|
|
|
if (!ssl->config) {
|
|
|
|
assert(ssl->config);
|
|
|
|
return -1;
|
|
|
|
}
|
2018-07-03 00:47:27 +01:00
|
|
|
if (ssl_has_certificate(ssl->config.get()) ||
|
2018-04-13 23:51:30 +01:00
|
|
|
ssl->ctx->client_cert_cb == NULL) {
|
2017-02-10 21:56:48 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
X509 *x509 = NULL;
|
|
|
|
EVP_PKEY *pkey = NULL;
|
|
|
|
int ret = ssl->ctx->client_cert_cb(ssl, &x509, &pkey);
|
|
|
|
if (ret < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
2017-08-02 22:16:31 +01:00
|
|
|
UniquePtr<X509> free_x509(x509);
|
|
|
|
UniquePtr<EVP_PKEY> free_pkey(pkey);
|
2017-02-10 21:56:48 +00:00
|
|
|
|
|
|
|
if (ret != 0) {
|
|
|
|
if (!SSL_use_certificate(ssl, x509) ||
|
|
|
|
!SSL_use_PrivateKey(ssl, pkey)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*cb)(SSL *ssl,
|
|
|
|
X509 **out_x509,
|
|
|
|
EVP_PKEY **out_pkey)) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
2017-08-29 21:33:21 +01:00
|
|
|
// Emulate the old client certificate callback with the new one.
|
2017-02-10 21:56:48 +00:00
|
|
|
SSL_CTX_set_cert_cb(ctx, do_client_cert_cb, NULL);
|
|
|
|
ctx->client_cert_cb = cb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_cert_store(X509_STORE **store_ptr, X509_STORE *new_store,
|
|
|
|
int take_ref) {
|
|
|
|
X509_STORE_free(*store_ptr);
|
|
|
|
*store_ptr = new_store;
|
|
|
|
|
|
|
|
if (new_store != NULL && take_ref) {
|
|
|
|
X509_STORE_up_ref(new_store);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_get_ex_data_X509_STORE_CTX_idx(void) {
|
2017-08-29 21:33:21 +01:00
|
|
|
// The ex_data index to go from |X509_STORE_CTX| to |SSL| always uses the
|
|
|
|
// reserved app_data slot. Before ex_data was introduced, app_data was used.
|
|
|
|
// Avoid breaking any software which assumes |X509_STORE_CTX_get_app_data|
|
|
|
|
// works.
|
2017-02-10 21:56:48 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set0_verify_cert_store(SSL_CTX *ctx, X509_STORE *store) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return set_cert_store(&ctx->cert->verify_store, store, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_CTX_set1_verify_cert_store(SSL_CTX *ctx, X509_STORE *store) {
|
|
|
|
check_ssl_ctx_x509_method(ctx);
|
|
|
|
return set_cert_store(&ctx->cert->verify_store, store, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set0_verify_cert_store(SSL *ssl, X509_STORE *store) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return set_cert_store(&ssl->config->cert->verify_store, store, 0);
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int SSL_set1_verify_cert_store(SSL *ssl, X509_STORE *store) {
|
|
|
|
check_ssl_x509_method(ssl);
|
2018-04-13 23:51:30 +01:00
|
|
|
if (!ssl->config) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return set_cert_store(&ssl->config->cert->verify_store, store, 1);
|
2017-02-10 21:56:48 +00:00
|
|
|
}
|
2018-01-03 17:43:50 +00:00
|
|
|
|
|
|
|
int SSL_alert_from_verify_result(long result) {
|
|
|
|
switch (result) {
|
2018-01-05 17:05:33 +00:00
|
|
|
case X509_V_ERR_CERT_CHAIN_TOO_LONG:
|
|
|
|
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
|
|
|
|
case X509_V_ERR_INVALID_CA:
|
|
|
|
case X509_V_ERR_PATH_LENGTH_EXCEEDED:
|
|
|
|
case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
|
2018-01-03 17:43:50 +00:00
|
|
|
case X509_V_ERR_UNABLE_TO_GET_CRL:
|
|
|
|
case X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER:
|
2018-01-05 17:05:33 +00:00
|
|
|
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
|
|
|
|
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
|
|
|
|
case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
|
2018-01-03 17:43:50 +00:00
|
|
|
return SSL_AD_UNKNOWN_CA;
|
|
|
|
|
|
|
|
case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
|
|
|
|
case X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
|
|
|
|
case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
|
|
|
|
case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
|
|
|
|
case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
|
|
|
|
case X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD:
|
|
|
|
case X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
|
|
|
|
case X509_V_ERR_CERT_UNTRUSTED:
|
|
|
|
case X509_V_ERR_CERT_REJECTED:
|
|
|
|
case X509_V_ERR_HOSTNAME_MISMATCH:
|
|
|
|
case X509_V_ERR_EMAIL_MISMATCH:
|
|
|
|
case X509_V_ERR_IP_ADDRESS_MISMATCH:
|
|
|
|
return SSL_AD_BAD_CERTIFICATE;
|
|
|
|
|
|
|
|
case X509_V_ERR_CERT_SIGNATURE_FAILURE:
|
|
|
|
case X509_V_ERR_CRL_SIGNATURE_FAILURE:
|
|
|
|
return SSL_AD_DECRYPT_ERROR;
|
|
|
|
|
|
|
|
case X509_V_ERR_CERT_HAS_EXPIRED:
|
2018-01-05 17:05:33 +00:00
|
|
|
case X509_V_ERR_CERT_NOT_YET_VALID:
|
2018-01-03 17:43:50 +00:00
|
|
|
case X509_V_ERR_CRL_HAS_EXPIRED:
|
2018-01-05 17:05:33 +00:00
|
|
|
case X509_V_ERR_CRL_NOT_YET_VALID:
|
2018-01-03 17:43:50 +00:00
|
|
|
return SSL_AD_CERTIFICATE_EXPIRED;
|
|
|
|
|
|
|
|
case X509_V_ERR_CERT_REVOKED:
|
|
|
|
return SSL_AD_CERTIFICATE_REVOKED;
|
|
|
|
|
|
|
|
case X509_V_ERR_UNSPECIFIED:
|
|
|
|
case X509_V_ERR_OUT_OF_MEM:
|
|
|
|
case X509_V_ERR_INVALID_CALL:
|
|
|
|
case X509_V_ERR_STORE_LOOKUP:
|
|
|
|
return SSL_AD_INTERNAL_ERROR;
|
|
|
|
|
|
|
|
case X509_V_ERR_APPLICATION_VERIFICATION:
|
|
|
|
return SSL_AD_HANDSHAKE_FAILURE;
|
|
|
|
|
|
|
|
case X509_V_ERR_INVALID_PURPOSE:
|
|
|
|
return SSL_AD_UNSUPPORTED_CERTIFICATE;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return SSL_AD_CERTIFICATE_UNKNOWN;
|
|
|
|
}
|
|
|
|
}
|