3 files changed, 10 insertions, 8 deletions
diff --git a/lib/dialyzer/src/dialyzer_gui.erl b/lib/dialyzer/src/dialyzer_gui.erl
index ac9844c22c..97e5752577 100644
--- a/lib/dialyzer/src/dialyzer_gui.erl
+++ b/lib/dialyzer/src/dialyzer_gui.erl
@@ -2,7 +2,7 @@
 %%------------------------------------------------------------------------
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1331,7 +1331,8 @@ build_analysis_record(#gui_state{mode = Mode, menu = Menu, options = Options,
   #analysis{defines = Options#options.defines,
 	    include_dirs = Options#options.include_dirs,
 	    plt = InitPlt,
-	    start_from = StartFrom}.
+	    start_from = StartFrom,
+	    solvers = Options#options.solvers}.
 
 get_anal_files(#gui_state{chosen_box = ChosenBox}, StartFrom) ->
   Files = gs:read(ChosenBox, items),
diff --git a/lib/dialyzer/src/dialyzer_gui_wx.erl b/lib/dialyzer/src/dialyzer_gui_wx.erl
index c6f7c56227..08f31c1e13 100644
--- a/lib/dialyzer/src/dialyzer_gui_wx.erl
+++ b/lib/dialyzer/src/dialyzer_gui_wx.erl
@@ -2,7 +2,7 @@
 %%------------------------------------------------------------------------
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -810,7 +810,8 @@ build_analysis_record(#gui_state{mode = Mode, menu = Menu, options = Options,
   #analysis{defines = Options#options.defines,
 	    include_dirs = Options#options.include_dirs,
 	    plt = InitPlt,
-	    start_from = StartFrom}.
+	    start_from = StartFrom,
+	    solvers = Options#options.solvers}.
 
 get_anal_files(#gui_state{files_to_analyze = Files}, StartFrom) ->
   FilteredMods =
diff --git a/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
index 5503f39412..e6256e5a53 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/tuple_set_crash.erl
@@ -69,8 +69,8 @@ test(TargetId, [Date | DateTail], Key, IVT, IVF) ->
 	{ok, message_from_server(), binary(), binary()}.
 culprit(Message, Key, IVecToServer, IVecFromServer) ->
     {Packet, NewIVecToServer} = message_to_packet(Message, Key, IVecToServer),
-    Message = crypto:aes_cbc_128_decrypt(Key, IVecFromServer, Packet),
-    NewIVecFromServer = crypto:aes_cbc_ivec(Packet),
+    Message = crypto:block_decrypt(aes_cbc128, Key, IVecFromServer, Packet),
+    NewIVecFromServer = crypto:next_iv(aes_cbc, Packet),
     ParsedMessage = parse_message(Message),
     {ok, ParsedMessage, NewIVecToServer, NewIVecFromServer}.
 
@@ -185,9 +185,9 @@ parse_audio_output_info(<<Output:?DWORD, BitMap:?BITMAP1, Rest/binary>>) ->
 -spec message_to_packet(binary(), binary(), binary()) -> {binary(), binary()}.
 message_to_packet(Message, Key, IVec) ->
     PaddedMessage = pad_pkcs5(Message),
-    Packet = crypto:aes_cbc_128_encrypt(Key, IVec, PaddedMessage),
+    Packet = crypto:block_encrypt(aes_cbc128, Key, IVec, PaddedMessage),
     TotalSize = byte_size(Packet),
-    NewIVec = crypto:aes_cbc_ivec(Packet),
+    NewIVec = crypto:next_iv(aes_cbc, Packet),
     {<<TotalSize:?WORD, Packet/binary>>, NewIVec}.
 
 -spec pad_pkcs5(binary()) -> binary().