Merge pull request #2934 from esl/cipher_suites

TLS and Ubuntu

big_tests/tests/connect_SUITE.erl

@@ -61,10 +61,9 @@ groups() ->
           {starttls, [], [should_fail_to_authenticate_without_starttls,
                           should_not_send_other_features_with_starttls_required,
                           auth_bind_pipelined_starttls_skipped_error | protocol_test_cases()]},
-          {tls, [parallel], [auth_bind_pipelined_session,
-                             auth_bind_pipelined_auth_failure,
-                             should_pass_with_tlsv1_2
-                             | protocol_test_cases() ++ cipher_test_cases()]},
+          {tls, [parallel], auth_bind_pipelined_cases() ++
+                            protocol_test_cases() ++
+                            cipher_test_cases()},
           {feature_order, [parallel], [stream_features_test,
                                        tls_authenticate,
                                        tls_compression_fail,
@@ -99,6 +98,12 @@ tls_groups()->
      {group, feature_order},
      {group, tls}].
 
+auth_bind_pipelined_cases() ->
+    [
+     auth_bind_pipelined_session,
+     auth_bind_pipelined_auth_failure
+    ].
+
 protocol_test_cases() ->
     [
      should_fail_with_sslv3,
@@ -750,7 +755,7 @@ ciphers_working_with_ssl_clients(Config) ->
 openssl_client_can_use_cipher(Cipher, Port) ->
     PortStr = integer_to_list(Port),
     Cmd = "echo '' | openssl s_client -connect localhost:" ++ PortStr ++
-          " -cipher " "\"" ++ Cipher ++ "\" 2>&1",
+          " -cipher " "\"" ++ Cipher ++ "\" -tls1_2 2>&1",
     {done, ReturnCode, _Result} = erlsh:oneliner(Cmd),
     0 == ReturnCode.
 

tools/ssl/Makefile

@@ -38,7 +38,7 @@ all: mongooseim/cert.pem mongooseim/key.pem \
 # So, let's remove the option for now.
 # https://bugs.launchpad.net/ubuntu/+source/openldap/+bug/1724285
 %/dh_server.pem:
-	openssl dhparam -outform PEM -out $@ 1024
+	openssl dhparam -outform PEM -out $@ 2048
 
 %/index.txt:
 	mkdir -p $(@D)