anchor.diff:      Port = ssl_test_lib:inet_port(Server),
       Exe = "openssl",
       ClientArgs = case SNIHostname of
  -                        undefined ->
  -                            ["s_client", "-connect", Hostname ++ ":" ++ integer_to_list(Port)];
  -                        _ ->
  -                            ["s_client", "-connect", Hostname ++ ":" ++ integer_to_list(Port), "-servername", SNIHostname]
  -                    end,
  +		     undefined ->
  +			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname,Port);
  +		     _ ->
  +			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname, Port, SNIHostname)
  +		 end,       
  +
       ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs), 
  -     
  +    
       %% Client check needs to be done befor server check,
       %% or server check might consume client messages
       ExpectedClientOutput = ["OK", "/CN=" ++ ExpectedCN ++ "/"],
  
positive.code: 	_  ->
  	    []
      end.
  
negative.code:     Port = ssl_test_lib:inet_port(Server),
      Exe = "openssl",
      ClientArgs = case SNIHostname of
  		     undefined ->
  			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname,Port);
  		     _ ->
  			 openssl_client_args(ssl_test_lib:supports_ssl_tls_version(sslv2), Hostname, Port, SNIHostname)
  		 end,       
      ClientPort = ssl_test_lib:portable_open_port(Exe, ClientArgs),  
      
      %% Client check needs to be done befor server check,
      %% or server check might consume client messages
      ExpectedClientOutput = ["OK", "/CN=" ++ ExpectedCN ++ "/"],
  