1100917 - Add SSL3/RC4 only server to ssltunnel

Status: RESOLVED FIXED

(Testing :: Mochitest, defect)

Description

[Masatoshi Kimura [:emk]]

This is needed to write a test for bug 1092835.

Comment 1

[Masatoshi Kimura [:emk]]

Attachment: Add config options for SSL3/RC4 only servers to ssltunnel

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 8525314 [details] [diff] [review]
Add config options for SSL3/RC4 only servers to ssltunnel

Review of attachment 8525314 [details] [diff] [review]:
-----------------------------------------------------------------

::: testing/mochitest/runtests.py
@@ +883,5 @@
>                       (loc.host, loc.port, self.sslPort, redirhost))
>  
> +      if option == "ssl3":
> +        config.write("ssl3:%s:%s:%s\n" % (loc.host, loc.port, self.sslPort))
> +      if option == "rc4":

You could combine these two and just do:
if option in ('ssl3', 'rc4'):
  	
config.write("%s:%s:%s:%s\n" % (option, loc.host, loc.port, self.sslPort))

::: testing/mochitest/ssltunnel/ssltunnel.cpp
@@ +1316,5 @@
> +      LOG_ERROR(("Server on port %d for redirhost option is not defined, use 'listen' option first", port));
> +      return 1;
> +    }
> +
> +    return 0;

It feels like you could combine these two into a single function and just pass the hashtable into it.

Comment 3

[Masatoshi Kimura [:emk]]

Landed with review comments addressed:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5e415846b951

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/5e415846b951