Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
d0a37d59
Commit
d0a37d59
authored
Jul 29, 2015
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Disable TLS session ticket if ticket key is not available
parent
58dd9243
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
4 deletions
+23
-4
src/shrpx_connection.cc
src/shrpx_connection.cc
+1
-1
src/shrpx_http2_session.cc
src/shrpx_http2_session.cc
+1
-1
src/shrpx_ssl.cc
src/shrpx_ssl.cc
+19
-1
src/shrpx_ssl.h
src/shrpx_ssl.h
+2
-1
No files found.
src/shrpx_connection.cc
View file @
d0a37d59
...
...
@@ -319,7 +319,7 @@ int Connection::tls_handshake() {
auto
ssl_ctx
=
SSL_get_SSL_CTX
(
tls
.
ssl
);
SSL_free
(
tls
.
ssl
);
auto
ssl
=
ssl
::
create_s
sl
(
ssl_ctx
);
auto
ssl
=
ssl
::
create_s
erver_ssl
(
ssl_ctx
,
nullptr
);
if
(
!
ssl
)
{
return
-
1
;
}
...
...
src/shrpx_http2_session.cc
View file @
d0a37d59
...
...
@@ -323,7 +323,7 @@ int Http2Session::initiate_connection() {
// We are establishing TLS connection. If conn_.tls.ssl, we may
// reuse the previous session.
if
(
!
conn_
.
tls
.
ssl
)
{
auto
ssl
=
ssl
::
create_ssl
(
ssl_ctx_
);
auto
ssl
=
ssl
::
create_
client_
ssl
(
ssl_ctx_
);
if
(
!
ssl
)
{
return
-
1
;
}
...
...
src/shrpx_ssl.cc
View file @
d0a37d59
...
...
@@ -695,6 +695,7 @@ SSL_CTX *create_ssl_client_context() {
return
ssl_ctx
;
}
namespace
{
SSL
*
create_ssl
(
SSL_CTX
*
ssl_ctx
)
{
auto
ssl
=
SSL_new
(
ssl_ctx
);
if
(
!
ssl
)
{
...
...
@@ -705,6 +706,23 @@ SSL *create_ssl(SSL_CTX *ssl_ctx) {
return
ssl
;
}
}
// namespace
SSL
*
create_server_ssl
(
SSL_CTX
*
ssl_ctx
,
Worker
*
worker
)
{
auto
ssl
=
create_ssl
(
ssl_ctx
);
if
(
!
ssl
)
{
return
nullptr
;
}
// Disable TLS session ticket if we don't have working ticket keys.
if
(
worker
&&
!
worker
->
get_ticket_keys
())
{
SSL_set_options
(
ssl
,
SSL_OP_NO_TICKET
);
}
return
ssl
;
}
SSL
*
create_client_ssl
(
SSL_CTX
*
ssl_ctx
)
{
return
create_ssl
(
ssl_ctx
);
}
ClientHandler
*
accept_connection
(
Worker
*
worker
,
int
fd
,
sockaddr
*
addr
,
int
addrlen
)
{
...
...
@@ -728,7 +746,7 @@ ClientHandler *accept_connection(Worker *worker, int fd, sockaddr *addr,
SSL
*
ssl
=
nullptr
;
auto
ssl_ctx
=
worker
->
get_sv_ssl_ctx
();
if
(
ssl_ctx
)
{
ssl
=
create_s
sl
(
ssl_ctx
);
ssl
=
create_s
erver_ssl
(
ssl_ctx
,
worker
);
if
(
!
ssl
)
{
return
nullptr
;
}
...
...
src/shrpx_ssl.h
View file @
d0a37d59
...
...
@@ -172,7 +172,8 @@ SSL_CTX *setup_client_ssl_context();
// this function returns nullptr.
CertLookupTree
*
create_cert_lookup_tree
();
SSL
*
create_ssl
(
SSL_CTX
*
ssl_ctx
);
SSL
*
create_server_ssl
(
SSL_CTX
*
ssl_ctx
,
Worker
*
worker
);
SSL
*
create_client_ssl
(
SSL_CTX
*
ssl_ctx
);
}
// namespace ssl
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment