diff options
author | Adam Langley <agl@google.com> | 2015-09-24 10:57:52 -0700 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-09-24 11:04:03 -0700 |
commit | 1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (patch) | |
tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/ssl/CMakeLists.txt | |
parent | 08656b61d075740bfb24ddcce65223146259fc02 (diff) | |
download | external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.zip external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.gz external_boringssl-1e4884f615b20946411a74e41eb9c6aa65e2d5f3.tar.bz2 |
external/boringssl: sync with upstream.
This change imports the current version of BoringSSL. The only local
change now is that |BORINGSSL_201509| is defined in base.h. This allows
this change to be made without (hopefully) breaking the build.
This change will need https://android-review.googlesource.com/172744 to
be landed afterwards to update a test.
Change-Id: I6d1f463f7785a2423bd846305af91c973c326104
Diffstat (limited to 'src/ssl/CMakeLists.txt')
-rw-r--r-- | src/ssl/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ssl/CMakeLists.txt b/src/ssl/CMakeLists.txt index cf5a29d..2785dcf 100644 --- a/src/ssl/CMakeLists.txt +++ b/src/ssl/CMakeLists.txt @@ -1,10 +1,11 @@ -include_directories(. .. ../include) +include_directories(../include) add_subdirectory(pqueue) add_library( ssl + custom_extensions.c d1_both.c d1_clnt.c d1_lib.c @@ -12,6 +13,7 @@ add_library( d1_pkt.c d1_srtp.c d1_srvr.c + dtls_record.c s3_both.c s3_clnt.c s3_enc.c @@ -20,18 +22,19 @@ add_library( s3_pkt.c s3_srvr.c ssl_aead_ctx.c - ssl_algs.c ssl_asn1.c + ssl_buffer.c ssl_cert.c ssl_cipher.c + ssl_file.c ssl_lib.c ssl_rsa.c - ssl_sess.c + ssl_session.c ssl_stat.c ssl_txt.c t1_enc.c t1_lib.c - t1_reneg.c + tls_record.c $<TARGET_OBJECTS:pqueue> ) |