Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
2011f366
Commit
2011f366
authored
6 years ago
by
Philippe Gorley
Browse files
Options
Downloads
Patches
Plain Diff
tls: fix compilation when not using tls 1.3
Change-Id: I43762a658e7f8fb43c6b0fda4cc38ce040e18f13
parent
63786c80
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/security/tls_session.cpp
+2
-2
2 additions, 2 deletions
src/security/tls_session.cpp
with
2 additions
and
2 deletions
src/security/tls_session.cpp
+
2
−
2
View file @
2011f366
...
@@ -858,7 +858,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
...
@@ -858,7 +858,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
// Following https://www.gnutls.org/manual/html_node/Safe-renegotiation.html
// Following https://www.gnutls.org/manual/html_node/Safe-renegotiation.html
// "Unlike TLS 1.2, the server is not allowed to change identities"
// "Unlike TLS 1.2, the server is not allowed to change identities"
// So, we don't have to check the status if we are the client
// So, we don't have to check the status if we are the client
#if
ndef _WIN32 // For now, windows use GNUTLS < 3.6.
5
#if
GNUTLS_VERSION_NUMBER >= 0x03060
5
bool
isTLS1_3
=
gnutls_protocol_get_version
(
session_
)
==
GNUTLS_TLS1_3
;
bool
isTLS1_3
=
gnutls_protocol_get_version
(
session_
)
==
GNUTLS_TLS1_3
;
if
(
!
isTLS1_3
||
(
isTLS1_3
&&
isServer_
))
{
if
(
!
isTLS1_3
||
(
isTLS1_3
&&
isServer_
))
{
#endif
#endif
...
@@ -866,7 +866,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
...
@@ -866,7 +866,7 @@ TlsSession::TlsSessionImpl::handleStateHandshake(TlsSessionState state)
RING_ERR
(
"[TLS] server identity changed! MiM attack?"
);
RING_ERR
(
"[TLS] server identity changed! MiM attack?"
);
return
TlsSessionState
::
SHUTDOWN
;
return
TlsSessionState
::
SHUTDOWN
;
}
}
#if
ndef _WIN32
#if
GNUTLS_VERSION_NUMBER >= 0x030605
}
}
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment