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

Merge pull request #1270 from baitisj/master 

Fix for compilation against modern LibreSSL
This commit is contained in:
Tatsuhiro Tsujikawa 2019-03-13 20:52:50 +09:00 committed by GitHub
parent e8b213e367 2c1570595e
commit ec519f22dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_tls.cc
View File

@ -364,11 +364,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_1_1_API #if OPENSSL_1_1_API || LIBRESSL_2_7_API
const unsigned char *id, const unsigned char *id,
#else // !OPENSSL_1_1_API #else // !(OPENSSL_1_1_API || LIBRESSL_2_7_API)
unsigned char *id, unsigned char *id,
#endif // !OPENSSL_1_1_API #endif // !(OPENSSL_1_1_API || LIBRESSL_2_7_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);