walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1295 from bratkartoffel/fix-compile-boringssl 

Fix compilation with boringssl
This commit is contained in:
Tatsuhiro Tsujikawa 2019-02-20 00:13:00 +09:00 committed by GitHub
parent adf09f2124 34482ed4df
commit f5feb16ef4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shrpx_tls.cc
View File

@ -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); SSL_CTX_set_alpn_select_cb(ssl_ctx, alpn_select_proto_cb, nullptr);
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L #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) // SSL_extension_supported(TLSEXT_TYPE_signed_certificate_timestamp)
// returns 1, which means OpenSSL internally handles it. But // returns 1, which means OpenSSL internally handles it. But
// OpenSSL handles signed_certificate_timestamp extension specially, // 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 // !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 OPENSSL_1_1_1_API
if (SSL_CTX_set_max_early_data(ssl_ctx, tlsconf.max_early_data) != 1) { 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 */ #endif /* !WORDS_BIGENDIAN */
StringRef get_x509_serial(BlockAllocator &balloc, X509 *x) { 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); auto sn = X509_get0_serialNumber(x);
uint64_t r; uint64_t r;
if (ASN1_INTEGER_get_uint64(&r, sn) != 1) { if (ASN1_INTEGER_get_uint64(&r, sn) != 1) {
@ -2038,7 +2038,7 @@ StringRef get_x509_serial(BlockAllocator &balloc, X509 *x) {
r = bswap64(r); r = bswap64(r);
return util::format_hex( return util::format_hex(
balloc, StringRef{reinterpret_cast<uint8_t *>(&r), sizeof(r)}); 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 sn = X509_get_serialNumber(x);
auto bn = BN_new(); auto bn = BN_new();
auto bn_d = defer(BN_free, bn); 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; return -1;
} }
#if defined(OPENSSL_IS_BORINGSSL)
char *s;
#else
unsigned char *s; unsigned char *s;
#endif
auto slen = BIO_get_mem_data(b, &s); auto slen = BIO_get_mem_data(b, &s);
auto tt = util::parse_openssl_asn1_time_print( auto tt = util::parse_openssl_asn1_time_print(
StringRef{s, static_cast<size_t>(slen)}); StringRef{s, static_cast<size_t>(slen)});