Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
7581dee1
Commit
7581dee1
authored
10 years ago
by
Kamil Dudka
Browse files
Options
Downloads
Patches
Plain Diff
nss: make the fallback to SSLv3 work again
This feature was unintentionally disabled by commit
ff92fcfb
.
parent
7c215585
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
RELEASE-NOTES
+1
-0
1 addition, 0 deletions
RELEASE-NOTES
lib/vtls/nss.c
+3
-3
3 additions, 3 deletions
lib/vtls/nss.c
with
4 additions
and
3 deletions
RELEASE-NOTES
+
1
−
0
View file @
7581dee1
...
...
@@ -35,6 +35,7 @@ This release includes the following bugfixes:
o getinfo: HTTP CONNECT code not reset between transfers [8]
o Curl_rand: Use a fake entropy for debug builds when CURL_ENTROPY set
o nss: do not abort on connection failure (failing tests 305 and 404)
o nss: make the fallback to SSLv3 work again
o
This release includes the following known bugs:
...
...
This diff is collapsed.
Click to expand it.
lib/vtls/nss.c
+
3
−
3
View file @
7581dee1
...
...
@@ -1315,6 +1315,7 @@ static CURLcode nss_init_sslver(SSLVersionRange *sslver,
switch
(
data
->
set
.
ssl
.
version
)
{
default:
case
CURL_SSLVERSION_DEFAULT
:
sslver
->
min
=
SSL_LIBRARY_VERSION_3_0
;
if
(
data
->
state
.
ssl_connect_retry
)
{
infof
(
data
,
"TLS disabled due to previous handshake failure
\n
"
);
sslver
->
max
=
SSL_LIBRARY_VERSION_3_0
;
...
...
@@ -1323,7 +1324,6 @@ static CURLcode nss_init_sslver(SSLVersionRange *sslver,
/* intentional fall-through to default to highest TLS version if possible */
case
CURL_SSLVERSION_TLSv1
:
sslver
->
min
=
SSL_LIBRARY_VERSION_TLS_1_0
;
#ifdef SSL_LIBRARY_VERSION_TLS_1_2
sslver
->
max
=
SSL_LIBRARY_VERSION_TLS_1_2
;
#elif defined SSL_LIBRARY_VERSION_TLS_1_1
...
...
@@ -1399,7 +1399,7 @@ static CURLcode nss_fail_connect(struct ssl_connect_data *connssl,
if
(
connssl
->
handle
&&
(
SSL_VersionRangeGet
(
connssl
->
handle
,
&
sslver
)
==
SECSuccess
)
&&
(
sslver
.
min
==
SSL_LIBRARY_VERSION_3_0
)
&&
(
sslver
.
max
=
=
SSL_LIBRARY_VERSION_
TLS_1
_0
)
&&
(
sslver
.
max
!
=
SSL_LIBRARY_VERSION_
3
_0
)
&&
isTLSIntoleranceError
(
err
))
{
/* schedule reconnect through Curl_retry_request() */
data
->
state
.
ssl_connect_retry
=
TRUE
;
...
...
@@ -1437,7 +1437,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
CURLcode
curlerr
;
SSLVersionRange
sslver
=
{
SSL_LIBRARY_VERSION_
3_0
,
/* min */
SSL_LIBRARY_VERSION_
TLS_1_0
,
/* min */
SSL_LIBRARY_VERSION_TLS_1_0
/* max */
};
...
...
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