diff options
author | Ingela Anderton Andin <[email protected]> | 2018-09-05 09:38:55 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-09-05 09:38:55 +0200 |
commit | 092f4847f489cba0381676a6a389ddbfc2af4f1e (patch) | |
tree | 42afcebb40b3bdbc1718f532aa8c0ee83a182e4a /lib/ssl/src/Makefile | |
parent | 1808df550501c5f834edf5d55d0bdcd2b4328d68 (diff) | |
parent | f90d75a081f6d5a9a3cfe6f8d387abd7a1489aca (diff) | |
download | otp-092f4847f489cba0381676a6a389ddbfc2af4f1e.tar.gz otp-092f4847f489cba0381676a6a389ddbfc2af4f1e.tar.bz2 otp-092f4847f489cba0381676a6a389ddbfc2af4f1e.zip |
Merge branch 'ingela/ssl/initial-tls-1.3-functions'
* ingela/ssl/initial-tls-1.3-functions:
ssl: Initial cipher suites adoption for TLS-1.3
ssl: Add new TLS-1.3 Alerts
ssl: Add initial TLS 1.3 hanshake encode/decode support
Diffstat (limited to 'lib/ssl/src/Makefile')
-rw-r--r-- | lib/ssl/src/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 9987990443..af36d04a99 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -70,6 +70,7 @@ MODULES= \ ssl_config \ ssl_connection \ tls_handshake \ + tls_handshake_1_3\ dtls_handshake\ ssl_handshake\ ssl_manager \ @@ -92,8 +93,9 @@ MODULES= \ INTERNAL_HRL_FILES = \ ssl_alert.hrl ssl_cipher.hrl \ tls_connection.hrl dtls_connection.hrl ssl_connection.hrl \ - ssl_handshake.hrl tls_handshake.hrl dtls_handshake.hrl ssl_api.hrl ssl_internal.hrl \ - ssl_record.hrl tls_record.hrl dtls_record.hrl ssl_srp.hrl + ssl_handshake.hrl tls_handshake.hrl tls_handshake_1_3.hrl dtls_handshake.hrl \ + ssl_api.hrl ssl_internal.hrl \ + ssl_record.hrl tls_record.hrl dtls_record.hrl ssl_srp.hrl ERL_FILES= \ $(MODULES:%=%.erl) \ @@ -170,6 +172,7 @@ $(EBIN)/tls_connection.$(EMULATOR): ssl_internal.hrl tls_connection.hrl tls_reco $(EBIN)/dtls_connection.$(EMULATOR): ssl_internal.hrl dtls_connection.hrl dtls_record.hrl ssl_cipher.hrl dtls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl $(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl tls_record.hrl ssl_cipher.hrl tls_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl $(EBIN)/tls_handshake.$(EMULATOR): ssl_internal.hrl ssl_connection.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl ../../public_key/include/public_key.hrl +$(EBIN)/tls_handshake_1_3.$(EMULATOR): tls_handshake_1_3.hrl tls_handshake.hrl ssl_internal.hrl $(EBIN)/ssl_manager.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl ../../kernel/include/file.hrl $(EBIN)/ssl_record.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl ssl_handshake.hrl ssl_alert.hrl $(EBIN)/ssl_session.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl |