walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

src: Rename OPENSSL_101_API macro as OPENSSL_1_1_API

This commit is contained in:
Tatsuhiro Tsujikawa 2016-09-11 00:38:20 +09:00
parent d9bb3448bf
commit a3a6b91c5f
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/shrpx_connection.cc
View File

@ -43,13 +43,13 @@ using namespace nghttp2;
namespace shrpx { namespace shrpx {
#if !OPENSSL_101_API #if !OPENSSL_1_1_API
void *BIO_get_data(BIO *bio) { return bio->ptr; } void *BIO_get_data(BIO *bio) { return bio->ptr; }
void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; } void BIO_set_data(BIO *bio, void *ptr) { bio->ptr = ptr; }
void BIO_set_init(BIO *bio, int init) { bio->init = init; } void BIO_set_init(BIO *bio, int init) { bio->init = init; }
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl, Connection::Connection(struct ev_loop *loop, int fd, SSL *ssl,
MemchunkPool *mcpool, ev_tstamp write_timeout, MemchunkPool *mcpool, ev_tstamp write_timeout,
@ -238,14 +238,14 @@ long shrpx_bio_ctrl(BIO *b, int cmd, long num, void *ptr) {
namespace { namespace {
int shrpx_bio_create(BIO *b) { int shrpx_bio_create(BIO *b) {
#if OPENSSL_101_API #if OPENSSL_1_1_API
BIO_set_init(b, 1); BIO_set_init(b, 1);
#else // !OPENSSL_101_API #else // !OPENSSL_1_1_API
b->init = 1; b->init = 1;
b->num = 0; b->num = 0;
b->ptr = nullptr; b->ptr = nullptr;
b->flags = 0; b->flags = 0;
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
return 1; return 1;
} }
} // namespace } // namespace
@ -256,17 +256,17 @@ int shrpx_bio_destroy(BIO *b) {
return 0; return 0;
} }
#if !OPENSSL_101_API #if !OPENSSL_1_1_API
b->ptr = nullptr; b->ptr = nullptr;
b->init = 0; b->init = 0;
b->flags = 0; b->flags = 0;
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
return 1; return 1;
} }
} // namespace } // namespace
#if OPENSSL_101_API #if OPENSSL_1_1_API
BIO_METHOD *create_bio_method() { BIO_METHOD *create_bio_method() {
auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio"); auto meth = BIO_meth_new(BIO_TYPE_FD, "nghttpx-bio");
@ -283,7 +283,7 @@ BIO_METHOD *create_bio_method() {
void delete_bio_method(BIO_METHOD *bio_method) { BIO_meth_free(bio_method); } void delete_bio_method(BIO_METHOD *bio_method) { BIO_meth_free(bio_method); }
#else // !OPENSSL_101_API #else // !OPENSSL_1_1_API
BIO_METHOD *create_bio_method() { BIO_METHOD *create_bio_method() {
static BIO_METHOD shrpx_bio_method = { static BIO_METHOD shrpx_bio_method = {
@ -297,7 +297,7 @@ BIO_METHOD *create_bio_method() {
void delete_bio_method(BIO_METHOD *bio_method) {} void delete_bio_method(BIO_METHOD *bio_method) {}
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
void Connection::set_ssl(SSL *ssl) { void Connection::set_ssl(SSL *ssl) {
tls.ssl = ssl; tls.ssl = ssl;

10
src/shrpx_ssl.cc
View File

@ -72,13 +72,13 @@ namespace shrpx {
namespace ssl { namespace ssl {
#if !OPENSSL_101_API #if !OPENSSL_1_1_API
namespace { namespace {
const unsigned char *ASN1_STRING_get0_data(ASN1_STRING *x) { const unsigned char *ASN1_STRING_get0_data(ASN1_STRING *x) {
return ASN1_STRING_data(x); return ASN1_STRING_data(x);
} }
} // namespace } // namespace
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
namespace { namespace {
int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len, int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len,
@ -280,11 +280,11 @@ int tls_session_new_cb(SSL *ssl, SSL_SESSION *session) {
namespace { namespace {
SSL_SESSION *tls_session_get_cb(SSL *ssl, SSL_SESSION *tls_session_get_cb(SSL *ssl,
#if OPENSSL_101_API #if OPENSSL_1_1_API
const unsigned char *id, const unsigned char *id,
#else // !OPENSSL_101_API #else // !OPENSSL_1_1_API
unsigned char *id, unsigned char *id,
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
int idlen, int *copy) { int idlen, int *copy) {
auto conn = static_cast<Connection *>(SSL_get_app_data(ssl)); auto conn = static_cast<Connection *>(SSL_get_app_data(ssl));
auto handler = static_cast<ClientHandler *>(conn->data); auto handler = static_cast<ClientHandler *>(conn->data);

10
src/ssl.cc
View File

@ -54,13 +54,13 @@ const char *const DEFAULT_CIPHER_LIST =
"SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-" "SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-"
"SHA:DES-CBC3-SHA:!DSS"; "SHA:DES-CBC3-SHA:!DSS";
#if OPENSSL_101_API #if OPENSSL_1_1_API
// CRYPTO_LOCK is deprecated as of OpenSSL 1.1.0 // CRYPTO_LOCK is deprecated as of OpenSSL 1.1.0
LibsslGlobalLock::LibsslGlobalLock() {} LibsslGlobalLock::LibsslGlobalLock() {}
LibsslGlobalLock::~LibsslGlobalLock() {} LibsslGlobalLock::~LibsslGlobalLock() {}
#else // !OPENSSL_101_API #else // !OPENSSL_1_1_API
namespace { namespace {
std::vector<std::mutex> ssl_global_locks; std::vector<std::mutex> ssl_global_locks;
@ -91,7 +91,7 @@ LibsslGlobalLock::LibsslGlobalLock() {
LibsslGlobalLock::~LibsslGlobalLock() { ssl_global_locks.clear(); } LibsslGlobalLock::~LibsslGlobalLock() { ssl_global_locks.clear(); }
#endif // !OPENSSL_101_API #endif // !OPENSSL_1_1_API
const char *get_tls_protocol(SSL *ssl) { const char *get_tls_protocol(SSL *ssl) {
switch (SSL_version(ssl)) { switch (SSL_version(ssl)) {
@ -166,9 +166,9 @@ bool check_http2_requirement(SSL *ssl) {
void libssl_init() { void libssl_init() {
// OPENSSL_config() is not available in BoringSSL. It is also // OPENSSL_config() is not available in BoringSSL. It is also
// deprecated as of OpenSSL 1.1.0. // deprecated as of OpenSSL 1.1.0.
#if !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_101_API #if !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
OPENSSL_config(nullptr); OPENSSL_config(nullptr);
#endif // !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_101_API #endif // !defined(OPENSSL_IS_BORINGSSL) && !OPENSSL_1_1_API
SSL_load_error_strings(); SSL_load_error_strings();
SSL_library_init(); SSL_library_init();

2
src/ssl_compat.h
View File

@ -26,7 +26,7 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#define OPENSSL_101_API \ #define OPENSSL_1_1_API \
(!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL) (!defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1010000fL)
#endif // OPENSSL_COMPAT_H #endif // OPENSSL_COMPAT_H

4
src/util.cc
View File

@ -1351,7 +1351,7 @@ uint32_t hash32(const StringRef &s) {
return h; return h;
} }
#if !OPENSSL_101_API #if !OPENSSL_1_1_API
namespace { namespace {
EVP_MD_CTX *EVP_MD_CTX_new(void) { return EVP_MD_CTX_create(); } EVP_MD_CTX *EVP_MD_CTX_new(void) { return EVP_MD_CTX_create(); }
} // namespace } // namespace
@ -1359,7 +1359,7 @@ EVP_MD_CTX *EVP_MD_CTX_new(void) { return EVP_MD_CTX_create(); }
namespace { namespace {
void EVP_MD_CTX_free(EVP_MD_CTX *ctx) { EVP_MD_CTX_destroy(ctx); } void EVP_MD_CTX_free(EVP_MD_CTX *ctx) { EVP_MD_CTX_destroy(ctx); }
} // namespace } // namespace
#endif #endif // !OPENSSL_1_1_API
int sha256(uint8_t *res, const StringRef &s) { int sha256(uint8_t *res, const StringRef &s) {
int rv; int rv;