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
67804cfc
Commit
67804cfc
authored
Feb 14, 2016
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Use ImmutableString for ciphers
parent
2344932b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/shrpx_config.cc
src/shrpx_config.cc
+1
-1
src/shrpx_config.h
src/shrpx_config.h
+1
-1
src/shrpx_ssl.cc
src/shrpx_ssl.cc
+4
-4
No files found.
src/shrpx_config.cc
View file @
67804cfc
...
@@ -1804,7 +1804,7 @@ int parse_config(const char *opt, const char *optarg,
...
@@ -1804,7 +1804,7 @@ int parse_config(const char *opt, const char *optarg,
return
0
;
return
0
;
}
}
case
SHRPX_OPTID_CIPHERS
:
case
SHRPX_OPTID_CIPHERS
:
mod_config
()
->
tls
.
ciphers
=
strcopy
(
optarg
)
;
mod_config
()
->
tls
.
ciphers
=
optarg
;
return
0
;
return
0
;
case
SHRPX_OPTID_CLIENT
:
case
SHRPX_OPTID_CLIENT
:
...
...
src/shrpx_config.h
View file @
67804cfc
...
@@ -430,7 +430,7 @@ struct TLSConfig {
...
@@ -430,7 +430,7 @@ struct TLSConfig {
ImmutableString
private_key_passwd
;
ImmutableString
private_key_passwd
;
ImmutableString
cert_file
;
ImmutableString
cert_file
;
ImmutableString
dh_param_file
;
ImmutableString
dh_param_file
;
std
::
unique_ptr
<
char
[]
>
ciphers
;
ImmutableString
ciphers
;
ImmutableString
cacert
;
ImmutableString
cacert
;
bool
insecure
;
bool
insecure
;
bool
no_http2_cipher_black_list
;
bool
no_http2_cipher_black_list
;
...
...
src/shrpx_ssl.cc
View file @
67804cfc
...
@@ -493,8 +493,8 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file
...
@@ -493,8 +493,8 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file
SSL_CTX_set_timeout
(
ssl_ctx
,
tlsconf
.
session_timeout
.
count
());
SSL_CTX_set_timeout
(
ssl_ctx
,
tlsconf
.
session_timeout
.
count
());
const
char
*
ciphers
;
const
char
*
ciphers
;
if
(
tlsconf
.
ciphers
)
{
if
(
!
tlsconf
.
ciphers
.
empty
()
)
{
ciphers
=
tlsconf
.
ciphers
.
get
();
ciphers
=
tlsconf
.
ciphers
.
c_str
();
}
else
{
}
else
{
ciphers
=
nghttp2
::
ssl
::
DEFAULT_CIPHER_LIST
;
ciphers
=
nghttp2
::
ssl
::
DEFAULT_CIPHER_LIST
;
}
}
...
@@ -683,8 +683,8 @@ SSL_CTX *create_ssl_client_context(
...
@@ -683,8 +683,8 @@ SSL_CTX *create_ssl_client_context(
SSL_CTX_set_options
(
ssl_ctx
,
ssl_opts
|
tlsconf
.
tls_proto_mask
);
SSL_CTX_set_options
(
ssl_ctx
,
ssl_opts
|
tlsconf
.
tls_proto_mask
);
const
char
*
ciphers
;
const
char
*
ciphers
;
if
(
tlsconf
.
ciphers
)
{
if
(
!
tlsconf
.
ciphers
.
empty
()
)
{
ciphers
=
tlsconf
.
ciphers
.
get
();
ciphers
=
tlsconf
.
ciphers
.
c_str
();
}
else
{
}
else
{
ciphers
=
nghttp2
::
ssl
::
DEFAULT_CIPHER_LIST
;
ciphers
=
nghttp2
::
ssl
::
DEFAULT_CIPHER_LIST
;
}
}
...
...
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