Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
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
Operations
Operations
Metrics
Environments
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
cpp-libs
Actor Framework
Commits
08185596
Unverified
Commit
08185596
authored
Dec 11, 2017
by
Dominik Charousset
Committed by
GitHub
Dec 11, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #630
Fix build with OpenSSL <= 1.0.1
parents
d6209980
5d995256
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
libcaf_openssl/caf/openssl/session.hpp
libcaf_openssl/caf/openssl/session.hpp
+4
-0
libcaf_openssl/src/session.cpp
libcaf_openssl/src/session.cpp
+10
-0
No files found.
libcaf_openssl/caf/openssl/session.hpp
View file @
08185596
...
@@ -38,6 +38,10 @@ CAF_POP_WARNINGS
...
@@ -38,6 +38,10 @@ CAF_POP_WARNINGS
# define CAF_SSL_HAS_NON_VERSIONED_TLS_FUN
# define CAF_SSL_HAS_NON_VERSIONED_TLS_FUN
#endif
#endif
#if defined(SSL_CTX_set_ecdh_auto)
# define CAF_SSL_HAS_ECDH_AUTO
#endif
namespace
caf
{
namespace
caf
{
namespace
openssl
{
namespace
openssl
{
...
...
libcaf_openssl/src/session.cpp
View file @
08185596
...
@@ -244,7 +244,17 @@ SSL_CTX* session::create_ssl_context() {
...
@@ -244,7 +244,17 @@ SSL_CTX* session::create_ssl_context() {
}
else
{
}
else
{
// No authentication.
// No authentication.
SSL_CTX_set_verify
(
ctx
,
SSL_VERIFY_NONE
,
nullptr
);
SSL_CTX_set_verify
(
ctx
,
SSL_VERIFY_NONE
,
nullptr
);
#ifdef CAF_SSL_HAS_ECDH_AUTO
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
SSL_CTX_set_ecdh_auto
(
ctx
,
1
);
#else
auto
ecdh
=
EC_KEY_new_by_curve_name
(
NID_secp384r1
);
if
(
!
ecdh
)
raise_ssl_error
(
"cannot get ECDH curve"
);
CAF_PUSH_WARNINGS
SSL_CTX_set_tmp_ecdh
(
ctx
,
ecdh
);
EC_KEY_free
(
ecdh
);
CAF_POP_WARNINGS
#endif
#ifdef CAF_SSL_HAS_SECURITY_LEVEL
#ifdef CAF_SSL_HAS_SECURITY_LEVEL
const
char
*
cipher
=
"AECDH-AES256-SHA@SECLEVEL=0"
;
const
char
*
cipher
=
"AECDH-AES256-SHA@SECLEVEL=0"
;
#else
#else
...
...
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