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
97843e38
Commit
97843e38
authored
Oct 02, 2016
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Use StringRef for tls_proto_list
parent
5dd27040
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
src/shrpx.cc
src/shrpx.cc
+1
-2
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
+1
-1
src/shrpx_ssl.h
src/shrpx_ssl.h
+1
-1
No files found.
src/shrpx.cc
View file @
97843e38
...
...
@@ -2448,8 +2448,7 @@ int process_options(Config *config,
tlsconf
.
npn_list
=
util
::
split_str
(
DEFAULT_NPN_LIST
,
','
);
}
if
(
tlsconf
.
tls_proto_list
.
empty
())
{
tlsconf
.
tls_proto_list
=
util
::
parse_config_str_list
(
DEFAULT_TLS_PROTO_LIST
);
tlsconf
.
tls_proto_list
=
util
::
split_str
(
DEFAULT_TLS_PROTO_LIST
,
','
);
}
tlsconf
.
tls_proto_mask
=
ssl
::
create_tls_proto_mask
(
tlsconf
.
tls_proto_list
);
...
...
src/shrpx_config.cc
View file @
97843e38
...
...
@@ -2309,7 +2309,7 @@ int parse_config(Config *config, int optid, const StringRef &opt,
return
0
;
case
SHRPX_OPTID_TLS_PROTO_LIST
:
config
->
tls
.
tls_proto_list
=
util
::
parse_config_str_list
(
optarg
);
config
->
tls
.
tls_proto_list
=
util
::
split_str
(
optarg
,
','
);
return
0
;
case
SHRPX_OPTID_VERIFY_CLIENT
:
...
...
src/shrpx_config.h
View file @
97843e38
...
...
@@ -528,7 +528,7 @@ struct TLSConfig {
// preference.
std
::
vector
<
StringRef
>
npn_list
;
// list of supported SSL/TLS protocol strings.
std
::
vector
<
std
::
string
>
tls_proto_list
;
std
::
vector
<
StringRef
>
tls_proto_list
;
BIO_METHOD
*
bio_method
;
// Bit mask to disable SSL/TLS protocol versions. This will be
// passed to SSL_CTX_set_options().
...
...
src/shrpx_ssl.cc
View file @
97843e38
...
...
@@ -495,7 +495,7 @@ constexpr TLSProtocol TLS_PROTOS[] = {
TLSProtocol
{
StringRef
::
from_lit
(
"TLSv1.1"
),
SSL_OP_NO_TLSv1_1
},
TLSProtocol
{
StringRef
::
from_lit
(
"TLSv1.0"
),
SSL_OP_NO_TLSv1
}};
long
int
create_tls_proto_mask
(
const
std
::
vector
<
std
::
string
>
&
tls_proto_list
)
{
long
int
create_tls_proto_mask
(
const
std
::
vector
<
StringRef
>
&
tls_proto_list
)
{
long
int
res
=
0
;
for
(
auto
&
supported
:
TLS_PROTOS
)
{
...
...
src/shrpx_ssl.h
View file @
97843e38
...
...
@@ -176,7 +176,7 @@ bool check_http2_requirement(SSL *ssl);
// Returns SSL/TLS option mask to disable SSL/TLS protocol version not
// included in |tls_proto_list|. The returned mask can be directly
// passed to SSL_CTX_set_options().
long
int
create_tls_proto_mask
(
const
std
::
vector
<
std
::
string
>
&
tls_proto_list
);
long
int
create_tls_proto_mask
(
const
std
::
vector
<
StringRef
>
&
tls_proto_list
);
int
set_alpn_prefs
(
std
::
vector
<
unsigned
char
>
&
out
,
const
std
::
vector
<
StringRef
>
&
protos
);
...
...
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