Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Knot Resolver
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
142
Issues
142
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
Knot projects
Knot Resolver
Commits
03f0d4b7
Commit
03f0d4b7
authored
Jun 08, 2018
by
Petr Špaček
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tls-ciphers' into 'master'
restrict TLS ciphers See merge request
!601
parents
2de02515
e3d306ce
Pipeline
#37000
passed with stages
in 6 minutes and 13 seconds
Changes
2
Pipelines
6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
daemon/io.c
daemon/io.c
+4
-0
daemon/tls.c
daemon/tls.c
+3
-1
No files found.
daemon/io.c
View file @
03f0d4b7
...
...
@@ -307,6 +307,10 @@ static void _tcp_accept(uv_stream_t *master, int status, bool tls)
timeout
+=
KR_CONN_RTT_MAX
*
3
;
if
(
!
session
->
tls_ctx
)
{
session
->
tls_ctx
=
tls_new
(
master
->
loop
->
data
);
if
(
!
session
->
tls_ctx
)
{
worker_session_close
(
session
);
return
;
}
session
->
tls_ctx
->
c
.
session
=
session
;
session
->
tls_ctx
->
c
.
handshake_state
=
TLS_HS_IN_PROGRESS
;
}
...
...
daemon/tls.c
View file @
03f0d4b7
...
...
@@ -59,7 +59,9 @@ static int kres_gnutls_set_priority(gnutls_session_t session) {
static
const
char
*
const
priorities
=
"NORMAL:"
/* GnuTLS defaults */
"-VERS-TLS1.0:-VERS-TLS1.1:"
/* TLS 1.2 and higher */
"-COMP-ALL:+COMP-NULL"
;
/* no compression*/
/* Some distros by default allow features that are considered
* too insecure nowadays, so let's disable them explicitly. */
"-VERS-SSL3.0:-ARCFOUR-128:-COMP-ALL:+COMP-NULL"
;
const
char
*
errpos
=
NULL
;
int
err
=
gnutls_priority_set_direct
(
session
,
priorities
,
&
errpos
);
if
(
err
!=
GNUTLS_E_SUCCESS
)
{
...
...
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