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
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
90
Issues
90
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
52071102
Commit
52071102
authored
Jan 17, 2018
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use our botan gh#1276 workaround only for botan < 2.4
fix
#3320
parent
1bb3e2e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
src/network/tcp_socket_handler.cpp
src/network/tcp_socket_handler.cpp
+3
-0
No files found.
src/network/tcp_socket_handler.cpp
View file @
52071102
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
#include <cstring>
#include <cstring>
#ifdef BOTAN_FOUND
#ifdef BOTAN_FOUND
# include <botan/version.h>
# include <botan/hex.h>
# include <botan/hex.h>
# include <botan/auto_rng.h>
# include <botan/auto_rng.h>
# include <botan/tls_exceptn.h>
# include <botan/tls_exceptn.h>
...
@@ -28,8 +29,10 @@ namespace
...
@@ -28,8 +29,10 @@ namespace
Botan
::
TLS
::
Session_Manager_In_Memory
&
get_session_manager
()
Botan
::
TLS
::
Session_Manager_In_Memory
&
get_session_manager
()
{
{
static
Botan
::
TLS
::
Session_Manager_In_Memory
session_manager
{
get_rng
()};
static
Botan
::
TLS
::
Session_Manager_In_Memory
session_manager
{
get_rng
()};
#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(2,4,0)
// workaround for https://github.com/randombit/botan/issues/1276
// workaround for https://github.com/randombit/botan/issues/1276
session_manager
.
remove_all
();
session_manager
.
remove_all
();
#endif
return
session_manager
;
return
session_manager
;
}
}
}
}
...
...
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