Skip to content

Commit ec3f8af

Browse files
committed
setupssl chgs
1 parent 5cde513 commit ec3f8af

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

irods/test/setupssl.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ def create_ssl_dir(irods_key_path = 'irods.key'):
3838
with open("/dev/null","wb") as dev_null:
3939
if 0 == create_server_cert(process_output = dev_null, irods_key_path = irods_key_path):
4040
if not keep_old:
41-
Popen('openssl dhparam -2 -out dhparams.pem',**silent_run).communicate()
41+
# TODO : verify SSL still works ok in iRODS with -dsaparam
42+
# TODO : possibly drive use of -dsaparam from a global command switch eg. --params-for-test-only
43+
Popen('openssl dhparam -dsaparam -out dhparams.pem 4096',**silent_run).communicate()
4244
return os.listdir(".")
4345
finally:
4446
os.chdir(save_cwd)
@@ -59,7 +61,7 @@ def test(options, args=()):
5961
shutil.rmtree(IRODS_SSL_DIR,ignore_errors=True)
6062
print("Generating new '{}'. This may take a while.".format(IRODS_SSL_DIR), file=sys.stderr)
6163
ssl_dir_files = create_ssl_dir()
62-
print('ssl_dir_files=', ssl_dir_files)
64+
print('ssl_dir_files=', ssl_dir_files,file=sys.stderr)
6365

6466
if __name__ == '__main__':
6567
import getopt

0 commit comments

Comments
 (0)