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
34482ed4
Commit
34482ed4
authored
Jan 18, 2019
by
Simon Frankenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation with boringssl
parent
9b6ced66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
src/shrpx_tls.cc
src/shrpx_tls.cc
+8
-4
No files found.
src/shrpx_tls.cc
View file @
34482ed4
...
...
@@ -961,7 +961,7 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file,
SSL_CTX_set_alpn_select_cb
(
ssl_ctx
,
alpn_select_proto_cb
,
nullptr
);
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
#if !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
#if !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
&& !defined(OPENSSL_IS_BORINGSSL)
// SSL_extension_supported(TLSEXT_TYPE_signed_certificate_timestamp)
// returns 1, which means OpenSSL internally handles it. But
// OpenSSL handles signed_certificate_timestamp extension specially,
...
...
@@ -992,7 +992,7 @@ SSL_CTX *create_ssl_context(const char *private_key_file, const char *cert_file,
}
# endif // !OPENSSL_1_1_1_API
}
#endif // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
#endif // !LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x10002000L
&& !defined(OPENSSL_IS_BORINGSSL)
#if OPENSSL_1_1_1_API
if
(
SSL_CTX_set_max_early_data
(
ssl_ctx
,
tlsconf
.
max_early_data
)
!=
1
)
{
...
...
@@ -2028,7 +2028,7 @@ StringRef get_x509_issuer_name(BlockAllocator &balloc, X509 *x) {
#endif
/* !WORDS_BIGENDIAN */
StringRef
get_x509_serial
(
BlockAllocator
&
balloc
,
X509
*
x
)
{
#if OPENSSL_1_1_API
#if OPENSSL_1_1_API
&& !defined(OPENSSL_IS_BORINGSSL)
auto
sn
=
X509_get0_serialNumber
(
x
);
uint64_t
r
;
if
(
ASN1_INTEGER_get_uint64
(
&
r
,
sn
)
!=
1
)
{
...
...
@@ -2038,7 +2038,7 @@ StringRef get_x509_serial(BlockAllocator &balloc, X509 *x) {
r
=
bswap64
(
r
);
return
util
::
format_hex
(
balloc
,
StringRef
{
reinterpret_cast
<
uint8_t
*>
(
&
r
),
sizeof
(
r
)});
#else // !OPENSSL_1_1_API
#else // !OPENSSL_1_1_API
|| OPENSSL_IS_BORINGSSL
auto
sn
=
X509_get_serialNumber
(
x
);
auto
bn
=
BN_new
();
auto
bn_d
=
defer
(
BN_free
,
bn
);
...
...
@@ -2081,7 +2081,11 @@ int time_t_from_asn1_time(time_t &t, const ASN1_TIME *at) {
return
-
1
;
}
#if defined(OPENSSL_IS_BORINGSSL)
char
*
s
;
#else
unsigned
char
*
s
;
#endif
auto
slen
=
BIO_get_mem_data
(
b
,
&
s
);
auto
tt
=
util
::
parse_openssl_asn1_time_print
(
StringRef
{
s
,
static_cast
<
size_t
>
(
slen
)});
...
...
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