Merge pull request #193 from xosdy/add-ciphers

Add `sockopts` options `ciphers`

src/smtp_socket.erl

@@ -50,6 +50,8 @@
                               {versions, ['tlsv1', 'tlsv1.1', 'tlsv1.2']},
                               {port, 0}]).
 
+-define(SSL_CONNECT_OPTIONS_KEYS, [ciphers]).
+
 -ifdef(TEST).
 -include_lib("eunit/include/eunit.hrl").
 -endif.
@@ -321,7 +323,9 @@ proplist_merge(PrimaryList, DefaultList) ->
 	MergedOther = lists:merge(lists:sort(PrimaryOther), lists:sort(DefaultOther)),
 
 	%% remove all the values that don't belong here
-	[Option  || Option = {Key, _} <- MergedTuples, proplists:is_defined(Key, DefaultList)] ++ [Option || Option <- MergedOther, Option == inet6 ].
+	[Option || Option = {Key, _} <- MergedTuples,
+			   lists:member(Key, ?SSL_CONNECT_OPTIONS_KEYS) or proplists:is_defined(Key, DefaultList)]
+		++ [Option || Option <- MergedOther, Option == inet6 ].
 
 parse_address(Options) ->
 	case proplists:get_value(ip, Options) of
@@ -652,11 +656,11 @@ option_test_() ->
 		{"ssl_connect_options merges provided proplist",
 		fun() ->
 			?assertEqual(lists:sort([list,{active, true},
-			                   {depth, 0},
-			                   {ip, {0,0,0,0}},
-			                   {port, 0},
-			                   {packet, 2},
-			                   {versions,[tlsv1,'tlsv1.1','tlsv1.2']}]),
+									 {depth, 0},
+									 {ip, {0,0,0,0}},
+									 {port, 0},
+									 {packet, 2},
+									 {versions, [tlsv1,'tlsv1.1','tlsv1.2']}]),
 			             lists:sort(ssl_connect_options([{active, true},{packet,2}])))
 		end
 		}