diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-03-09 15:13:51 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-03-09 15:13:51 +0100 |
| commit | ad771692fec71f2929bdc715cc44ca24757c75f3 (patch) | |
| tree | 55f6d72d26b6e515bb3aa71ebd1dc4d7f0714081 /lib/ssl/src/Makefile | |
| parent | 6c59d3f422ca9ee1687abda43cf553eea09d78bf (diff) | |
| parent | d4fd18e715954d0310deb4ccbedebe0bddcef82c (diff) | |
| download | otp-ad771692fec71f2929bdc715cc44ca24757c75f3.tar.gz otp-ad771692fec71f2929bdc715cc44ca24757c75f3.tar.bz2 otp-ad771692fec71f2929bdc715cc44ca24757c75f3.zip | |
Merge branch 'ia/ssl/crl-cache/OTP-10362'
* ia/ssl/crl-cache/OTP-10362:
ssl: fix white box tests
ssl: Integrate public_key CRL verification with the ssl application
Diffstat (limited to 'lib/ssl/src/Makefile')
| -rw-r--r-- | lib/ssl/src/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile index 0c00a650b9..d71d3fc445 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1999-2014. All Rights Reserved. +# Copyright Ericsson AB 1999-2015. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -38,7 +38,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/ssl-$(VSN) # ---------------------------------------------------- BEHAVIOUR_MODULES= \ - ssl_session_cache_api + ssl_session_cache_api \ + ssl_crl_cache_api MODULES= \ ssl \ @@ -65,6 +66,8 @@ MODULES= \ ssl_manager \ ssl_session \ ssl_session_cache \ + ssl_crl\ + ssl_crl_cache \ ssl_socket \ ssl_listen_tracker_sup \ tls_record \ @@ -164,5 +167,5 @@ $(EBIN)/ssl_session_cache.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl $(EBIN)/ssl_session_cache_api.$(EMULATOR): ssl_internal.hrl ssl_handshake.hrl $(EBIN)/ssl_ssl3.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl $(EBIN)/ssl_tls1.$(EMULATOR): ssl_internal.hrl ssl_record.hrl ssl_cipher.hrl - +$(EBIN)/ssl_cache.$(EMULATOR): ssl_cache.erl ssl_internal.hrl ../../public_key/include/public_key.hrl |