81f030b106
Although we are derived from 1.0.2, we mimic 1.1.0 in some ways around our FOO_up_ref functions and opaque libssl types. This causes some difficulties when porting third-party code as any OPENSSL_VERSION_NUMBER checks for 1.1.0 APIs we have will be wrong. Moreover, adding accessors without changing OPENSSL_VERSION_NUMBER can break external projects. It is common to implement a compatibility version of an accessor under #ifdef as a static function. This then conflicts with our headers if we, unlike OpenSSL 1.0.2, have this function. This change switches OPENSSL_VERSION_NUMBER to 1.1.0 and atomically adds enough accessors for software with 1.1.0 support already. The hope is this will unblock hiding SSL_CTX and SSL_SESSION, which will be especially useful with C++-ficiation. The cost is we will hit some growing pains as more 1.1.0 consumers enter the ecosystem and we converge on the right set of APIs to import from upstream. It does not remove any 1.0.2 APIs, so we will not require that all projects support 1.1.0. The exception is APIs which changed in 1.1.0 but did not change the function signature. Those are breaking changes. Specifically: - SSL_CTX_sess_set_get_cb is now const-correct. - X509_get0_signature is now const-correct. For C++ consumers only, this change temporarily includes an overload hack for SSL_CTX_sess_set_get_cb that keeps the old callback working. This is a workaround for Node not yet supporting OpenSSL 1.1.0. The version number is set at (the as yet unreleased) 1.1.0g to denote that this change includes https://github.com/openssl/openssl/pull/4384. Bug: 91 Change-Id: I5eeb27448a6db4c25c244afac37f9604d9608a76 Reviewed-on: https://boringssl-review.googlesource.com/10340 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>
68 lines
2.0 KiB
C
68 lines
2.0 KiB
C
/* Copyright (c) 2014, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
/* This header is provided in order to make compiling against code that expects
|
|
OpenSSL easier. */
|
|
|
|
#ifndef OPENSSL_HEADER_OPENSSLCONF_H
|
|
#define OPENSSL_HEADER_OPENSSLCONF_H
|
|
|
|
|
|
#define OPENSSL_NO_ASYNC
|
|
#define OPENSSL_NO_BF
|
|
#define OPENSSL_NO_BLAKE2
|
|
#define OPENSSL_NO_BUF_FREELISTS
|
|
#define OPENSSL_NO_CAMELLIA
|
|
#define OPENSSL_NO_CAPIENG
|
|
#define OPENSSL_NO_CAST
|
|
#define OPENSSL_NO_CMS
|
|
#define OPENSSL_NO_COMP
|
|
#define OPENSSL_NO_CT
|
|
#define OPENSSL_NO_DANE
|
|
#define OPENSSL_NO_DEPRECATED
|
|
#define OPENSSL_NO_DGRAM
|
|
#define OPENSSL_NO_DYNAMIC_ENGINE
|
|
#define OPENSSL_NO_EC_NISTP_64_GCC_128
|
|
#define OPENSSL_NO_EC2M
|
|
#define OPENSSL_NO_EGD
|
|
#define OPENSSL_NO_ENGINE
|
|
#define OPENSSL_NO_GMP
|
|
#define OPENSSL_NO_GOST
|
|
#define OPENSSL_NO_HEARTBEATS
|
|
#define OPENSSL_NO_HW
|
|
#define OPENSSL_NO_IDEA
|
|
#define OPENSSL_NO_JPAKE
|
|
#define OPENSSL_NO_KRB5
|
|
#define OPENSSL_NO_MD2
|
|
#define OPENSSL_NO_MDC2
|
|
#define OPENSSL_NO_OCB
|
|
#define OPENSSL_NO_OCSP
|
|
#define OPENSSL_NO_RC2
|
|
#define OPENSSL_NO_RC5
|
|
#define OPENSSL_NO_RFC3779
|
|
#define OPENSSL_NO_RIPEMD
|
|
#define OPENSSL_NO_RMD160
|
|
#define OPENSSL_NO_SCTP
|
|
#define OPENSSL_NO_SEED
|
|
#define OPENSSL_NO_SRP
|
|
#define OPENSSL_NO_SSL2
|
|
#define OPENSSL_NO_SSL3
|
|
#define OPENSSL_NO_SSL3_METHOD
|
|
#define OPENSSL_NO_STATIC_ENGINE
|
|
#define OPENSSL_NO_STORE
|
|
#define OPENSSL_NO_WHIRLPOOL
|
|
|
|
|
|
#endif // OPENSSL_HEADER_OPENSSLCONF_H
|