Merge branch 'danilagamma-devel' into devel

src/epgsql_sock.erl

@@ -381,7 +381,8 @@ start_ssl(S, Flag, Opts, State) ->
     {ok, <<Code>>} = gen_tcp:recv(S, 1, Timeout),
     case Code of
         $S  ->
-            case ssl:connect(S, Opts, Timeout) of
+            SslOpts = proplists:get_value(ssl_opts, Opts, []),
+            case ssl:connect(S, SslOpts, Timeout) of
                 {ok, S2}        -> State#state{mod = ssl, sock = S2};
                 {error, Reason} -> exit({ssl_negotiation_failed, Reason})
             end;

test/epgsql_SUITE.erl

@@ -237,7 +237,8 @@ connect_with_client_cert(Config) ->
              {ok, _, [{Serial2}]} = Module:equery(C, "select ssl_client_serial()")
          end,
          "epgsql_test_cert",
-        [{ssl, true}, {keyfile, File("epgsql.key")}, {certfile, File("epgsql.crt")}]).
+        [{ssl, true}, {ssl_opts, [{keyfile, File("epgsql.key")},
+                                  {certfile, File("epgsql.crt")}]}]).
 
 -ifdef(have_maps).
 connect_map(Config) ->