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

Compile with OpenSSL 1.1.0-pre1

This commit is contained in:
Tatsuhiro Tsujikawa 2015-12-11 23:14:52 +09:00
parent 68c5deea5a
commit 248a64f0b2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/HttpServer.cc
View File

@ -53,6 +53,7 @@
#include <deque> #include <deque>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/dh.h>
#include <zlib.h> #include <zlib.h>

1
src/shrpx_ssl.cc
View File

@ -41,6 +41,7 @@
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/dh.h>
#include <nghttp2/nghttp2.h> #include <nghttp2/nghttp2.h>

13
src/ssl.cc
View File

@ -80,12 +80,7 @@ LibsslGlobalLock::LibsslGlobalLock() {
LibsslGlobalLock::~LibsslGlobalLock() { ssl_global_locks.clear(); } LibsslGlobalLock::~LibsslGlobalLock() { ssl_global_locks.clear(); }
const char *get_tls_protocol(SSL *ssl) { const char *get_tls_protocol(SSL *ssl) {
auto session = SSL_get_session(ssl); switch (SSL_version(ssl)) {
if (!session) {
return "unknown";
}
switch (session->ssl_version) {
case SSL2_VERSION: case SSL2_VERSION:
return "SSLv2"; return "SSLv2";
case SSL3_VERSION: case SSL3_VERSION:
@ -113,10 +108,12 @@ TLSSessionInfo *get_tls_session_info(TLSSessionInfo *tls_info, SSL *ssl) {
tls_info->cipher = SSL_get_cipher_name(ssl); tls_info->cipher = SSL_get_cipher_name(ssl);
tls_info->protocol = get_tls_protocol(ssl); tls_info->protocol = get_tls_protocol(ssl);
tls_info->session_id = session->session_id;
tls_info->session_id_length = session->session_id_length;
tls_info->session_reused = SSL_session_reused(ssl); tls_info->session_reused = SSL_session_reused(ssl);
unsigned int session_id_length;
tls_info->session_id = SSL_SESSION_get_id(session, &session_id_length);
tls_info->session_id_length = session_id_length;
return tls_info; return tls_info;
} }