diff options
author | Ingela Anderton Andin <[email protected]> | 2017-08-11 09:59:29 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-08-11 09:59:29 +0200 |
commit | 99f0de1edcf0d49117fe5699230edf5f2d45c39a (patch) | |
tree | f09e95254b53aa916b725302738c5af9af3216f6 /lib/ssl/test/Makefile | |
parent | 49918dd747d6d949d72ca51f1323b04abd2afba5 (diff) | |
parent | e0765bd47591624ac715e7023a0b0d292c1b12e8 (diff) | |
download | otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.tar.gz otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.tar.bz2 otp-99f0de1edcf0d49117fe5699230edf5f2d45c39a.zip |
Merge branch 'ingela/ssl/cert-handling' into maint
* ingela/ssl/cert-handling:
ssl: Correct cipher suite handling
ssl: Modernize DSA cert chain generation
ssl: Clean
ssl: Remove test of OpenSSL
ssl: Use new cert generation
Diffstat (limited to 'lib/ssl/test/Makefile')
-rw-r--r-- | lib/ssl/test/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/test/Makefile b/lib/ssl/test/Makefile index 558be6d642..c7e2f402af 100644 --- a/lib/ssl/test/Makefile +++ b/lib/ssl/test/Makefile @@ -56,7 +56,6 @@ MODULES = \ ssl_upgrade_SUITE\ ssl_sni_SUITE \ make_certs\ - erl_make_certs\ x509_test |