Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
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
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
Libraries
nghttp2
Commits
00964642
Commit
00964642
authored
Apr 14, 2018
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use LIBRESSL_IN_USE instead of defined(LIBRESSL_VERSION_NUMBER)
parent
8d0b4544
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/shrpx_tls.cc
src/shrpx_tls.cc
+4
-4
No files found.
src/shrpx_tls.cc
View file @
00964642
...
@@ -194,7 +194,7 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
...
@@ -194,7 +194,7 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
const
auto
&
ssl_ctx_list
=
conn_handler
->
get_indexed_ssl_ctx
(
idx
);
const
auto
&
ssl_ctx_list
=
conn_handler
->
get_indexed_ssl_ctx
(
idx
);
assert
(
!
ssl_ctx_list
.
empty
());
assert
(
!
ssl_ctx_list
.
empty
());
#if !defined(OPENSSL_IS_BORINGSSL) && !
defined(LIBRESSL_VERSION_NUMBER) &&
\
#if !defined(OPENSSL_IS_BORINGSSL) && !
LIBRESSL_IN_USE &&
\
OPENSSL_VERSION_NUMBER >= 0x10002000L
OPENSSL_VERSION_NUMBER >= 0x10002000L
auto
num_shared_curves
=
SSL_get_shared_curve
(
ssl
,
-
1
);
auto
num_shared_curves
=
SSL_get_shared_curve
(
ssl
,
-
1
);
...
@@ -238,7 +238,7 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
...
@@ -238,7 +238,7 @@ int servername_callback(SSL *ssl, int *al, void *arg) {
}
}
}
}
}
}
#endif // !defined(OPENSSL_IS_BORINGSSL) && !
defined(LIBRESSL_VERSION_NUMBER)
&&
#endif // !defined(OPENSSL_IS_BORINGSSL) && !
LIBRESSL_IN_USE
&&
// OPENSSL_VERSION_NUMBER >= 0x10002000L
// OPENSSL_VERSION_NUMBER >= 0x10002000L
SSL_set_SSL_CTX
(
ssl
,
ssl_ctx_list
[
0
]);
SSL_set_SSL_CTX
(
ssl
,
ssl_ctx_list
[
0
]);
...
@@ -1851,7 +1851,7 @@ int proto_version_from_string(const StringRef &v) {
...
@@ -1851,7 +1851,7 @@ int proto_version_from_string(const StringRef &v) {
int
verify_ocsp_response
(
SSL_CTX
*
ssl_ctx
,
const
uint8_t
*
ocsp_resp
,
int
verify_ocsp_response
(
SSL_CTX
*
ssl_ctx
,
const
uint8_t
*
ocsp_resp
,
size_t
ocsp_resplen
)
{
size_t
ocsp_resplen
)
{
#if !defined(OPENSSL_NO_OCSP) && !
defined(LIBRESSL_VERSION_NUMBER) &&
\
#if !defined(OPENSSL_NO_OCSP) && !
LIBRESSL_IN_USE &&
\
OPENSSL_VERSION_NUMBER >= 0x10002000L
OPENSSL_VERSION_NUMBER >= 0x10002000L
int
rv
;
int
rv
;
...
@@ -1924,7 +1924,7 @@ int verify_ocsp_response(SSL_CTX *ssl_ctx, const uint8_t *ocsp_resp,
...
@@ -1924,7 +1924,7 @@ int verify_ocsp_response(SSL_CTX *ssl_ctx, const uint8_t *ocsp_resp,
if
(
LOG_ENABLED
(
INFO
))
{
if
(
LOG_ENABLED
(
INFO
))
{
LOG
(
INFO
)
<<
"OCSP verification succeeded"
;
LOG
(
INFO
)
<<
"OCSP verification succeeded"
;
}
}
#endif // !defined(OPENSSL_NO_OCSP) && !
defined(LIBRESSL_VERSION_NUMBER)
#endif // !defined(OPENSSL_NO_OCSP) && !
LIBRESSL_IN_USE
// && OPENSSL_VERSION_NUMBER >= 0x10002000L
// && OPENSSL_VERSION_NUMBER >= 0x10002000L
return
0
;
return
0
;
...
...
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