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
5d354418
Commit
5d354418
authored
Jan 08, 2015
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Fix crash in SSL_CTX_set_tlsext_ticket_key_cb
It seems that returning 0 when enc == 0 crashes OpenSSL.
parent
5dce9501
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/shrpx.cc
src/shrpx.cc
+0
-1
src/shrpx_ssl.cc
src/shrpx_ssl.cc
+3
-3
No files found.
src/shrpx.cc
View file @
5d354418
...
@@ -465,7 +465,6 @@ void renew_ticket_key_cb(struct ev_loop *loop, ev_timer *w, int revents) {
...
@@ -465,7 +465,6 @@ void renew_ticket_key_cb(struct ev_loop *loop, ev_timer *w, int revents) {
if
(
LOG_ENABLED
(
INFO
))
{
if
(
LOG_ENABLED
(
INFO
))
{
LOG
(
INFO
)
<<
"failed to renew ticket key"
;
LOG
(
INFO
)
<<
"failed to renew ticket key"
;
}
}
mod_config
()
->
ticket_keys
.
reset
();
return
;
return
;
}
}
...
...
src/shrpx_ssl.cc
View file @
5d354418
...
@@ -160,8 +160,8 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
...
@@ -160,8 +160,8 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
#endif // NOTHREADS
#endif // NOTHREADS
if
(
!
ticket_keys
)
{
if
(
!
ticket_keys
)
{
/
* No ticket keys available. Perform full handshake */
/
/ No ticket keys available.
return
0
;
return
-
1
;
}
}
auto
&
keys
=
ticket_keys
->
keys
;
auto
&
keys
=
ticket_keys
->
keys
;
...
@@ -172,7 +172,7 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
...
@@ -172,7 +172,7 @@ int ticket_key_cb(SSL *ssl, unsigned char *key_name, unsigned char *iv,
if
(
LOG_ENABLED
(
INFO
))
{
if
(
LOG_ENABLED
(
INFO
))
{
CLOG
(
INFO
,
handler
)
<<
"session ticket key: RAND_bytes failed"
;
CLOG
(
INFO
,
handler
)
<<
"session ticket key: RAND_bytes failed"
;
}
}
return
0
;
return
-
1
;
}
}
auto
&
key
=
keys
[
0
];
auto
&
key
=
keys
[
0
];
...
...
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