Skip to content

Commit e2b85bc

Browse files
author
zaycevm
committed
Patch for BoringSSL include
commit_hash:1fab05b03e5d78b93a76856832f03cc5720552cf
1 parent 2b06fc5 commit e2b85bc

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

build/sysincl/misc.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -455,12 +455,3 @@
455455
includes:
456456
- thread.h: contrib/restricted/ffmpeg/libavcodec/thread.h
457457
- jni.h: contrib/restricted/ffmpeg/libavcodec/jni.h
458-
459-
- source_filter: "^contrib/libs/ngtcp2/crypto/(boringssl/boringssl[.]c|includes/ngtcp2/ngtcp2_crypto_boringssl[.]h)$"
460-
includes:
461-
- openssl/ssl.h: contrib/restricted/google/boringssl/include/openssl/ssl.h
462-
- openssl/evp.h: contrib/restricted/google/boringssl/include/openssl/evp.h
463-
- openssl/hkdf.h: contrib/restricted/google/boringssl/include/openssl/hkdf.h
464-
- openssl/aes.h: contrib/restricted/google/boringssl/include/openssl/aes.h
465-
- openssl/chacha.h: contrib/restricted/google/boringssl/include/openssl/chacha.h
466-
- openssl/rand.h: contrib/restricted/google/boringssl/include/openssl/rand.h

contrib/libs/ngtcp2/crypto/includes/ngtcp2/ngtcp2_crypto_boringssl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include <ngtcp2/ngtcp2.h>
2929

30-
#include <openssl/ssl.h>
30+
#include <contrib/restricted/google/boringssl/include/openssl/ssl.h>
3131

3232
#ifdef __cplusplus
3333
extern "C" {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/crypto/includes/ngtcp2/ngtcp2_crypto_boringssl.h (index)
2+
+++ b/crypto/includes/ngtcp2/ngtcp2_crypto_boringssl.h (working tree)
3+
@@ -27,7 +27,7 @@
4+
5+
#include <ngtcp2/ngtcp2.h>
6+
7+
-#include <openssl/ssl.h>
8+
+#include <contrib/restricted/google/boringssl/include/openssl/ssl.h>
9+
10+
#ifdef __cplusplus
11+
extern "C" {

0 commit comments

Comments
 (0)