Commit 947dfbd1 authored by Steven Fackler's avatar Steven Fackler
Browse files

Small cleanup 

Closes #981
parent aa5cfbe2

openssl/src/rsa.rs

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
//! RSA is one of the earliest asymmetric public key encryption schemes.

//! Like many other cryptosystems, RSA relies on the presumed difficulty of a hard

//! mathematical problem, namely factorization of the product of two large prime

//! numbers. At the moment there does exist an algorithm that can factor such

//! numbers. At the moment there does not exist an algorithm that can factor such

//! large numbers in reasonable time. RSA is used in a wide variety of

//! applications including digital signatures and key exchanges such as

//! establishing a TLS/SSL connection.

openssl/src/ssl/connector.rs

+11 −14
Original line number Diff line number Diff line
@@ -214,16 +214,14 @@ ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg== 
        ctx.set_tmp_dh(&dh)?;

        setup_curves(&mut ctx)?;

        ctx.set_cipher_list(

            "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",

            "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",

        )?;

        Ok(SslAcceptorBuilder(ctx))

    }
@@ -241,10 +239,9 @@ ssbzSibBsu/6iGtCOGEoXJf//////////wIBAg== 
        ctx.set_options(SslOptions::NO_TLSV1_3);

        setup_curves(&mut ctx)?;

        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-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",

        )?;

        Ok(SslAcceptorBuilder(ctx))

    }