diff options
| author | Raimo Niskanen <[email protected]> | 2018-04-27 12:00:47 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-04-27 12:00:47 +0200 |
| commit | 87b06e4ab91729f7415578c8ac0aacec28720ad9 (patch) | |
| tree | d0d0c38d840e9919831ce9d08d554452a4aad3d4 /lib/ssl/test/ssl_dist_SUITE.erl | |
| parent | 8f825cfd0134f892c681dd31a98ba34b34bf108c (diff) | |
| parent | 5803f0ad5be257b451588e8da83d1295eabea85e (diff) | |
| download | otp-87b06e4ab91729f7415578c8ac0aacec28720ad9.tar.gz otp-87b06e4ab91729f7415578c8ac0aacec28720ad9.tar.bz2 otp-87b06e4ab91729f7415578c8ac0aacec28720ad9.zip | |
Merge branch 'raimo/better-TLS-distribution/OTP-14969'
* raimo/better-TLS-distribution/OTP-14969:
Fix distro CRL test cases short vs long names
Allow check for node name
Move check ip to before SSL handshake
Check client IP from server
Parse cert primarily for host names
Open for host and node allow list
Create plug-in for distro cert nodes
Rewrite TLS dist to handle node names in certs
Improve node allowed check
Diffstat (limited to 'lib/ssl/test/ssl_dist_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_dist_SUITE.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl index c822a52d1f..003e1fc448 100644 --- a/lib/ssl/test/ssl_dist_SUITE.erl +++ b/lib/ssl/test/ssl_dist_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2017. All Rights Reserved. +%% Copyright Ericsson AB 2007-2018. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ -include("ssl_dist_test_lib.hrl"). %% Note: This directive should only be used in test suites. --compile(export_all). +-compile([export_all, nowarn_export_all]). -define(DEFAULT_TIMETRAP_SECS, 240). @@ -724,7 +724,8 @@ setup_certs(Config) -> ok = file:make_dir(NodeDir), ok = file:make_dir(RGenDir), make_randfile(RGenDir), - {ok, _} = make_certs:all(RGenDir, NodeDir), + [Hostname|_] = string:split(net_adm:localhost(), ".", all), + {ok, _} = make_certs:all(RGenDir, NodeDir, [{hostname,Hostname}]), SDir = filename:join([NodeDir, "server"]), SC = filename:join([SDir, "cert.pem"]), SK = filename:join([SDir, "key.pem"]), |