Commit 8fa9b587 authored by Steven Fackler's avatar Steven Fackler
Browse files

Tweak formatting on cipher list

parent 01927c19

openssl/src/ssl/connector.rs

+13 −18
Original line number Diff line number Diff line
@@ -224,17 +224,13 @@ impl SslAcceptorBuilder { 
            "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\

             ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\

             ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\

                                  DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:\

                                  ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:\

                                  ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:\

                                  ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:\

                                  ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:\

                                  DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:\

                                  DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:\

                                  ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:\

                                  EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:\

                                  AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:\

                                  DES-CBC3-SHA:!DSS",

             DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:\

             ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:\

             ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:\

             ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:\

             DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:\

             EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:\

             AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS",

            ));

        Ok(SslAcceptorBuilder(ctx))

    }
@@ -246,9 +242,8 @@ impl SslAcceptorBuilder { 
        try!(ctx.set_cipher_list(

            "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\

             ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\

                                  ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:\

                                  ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:\

                                  ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256",

             ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:\

             ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256",

        ));

        Ok(SslAcceptorBuilder(ctx))

    }