Commit 508ff7f6 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Stop using unimplemented cipher classes. 


Add comments to no longer usable ciphers.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5023)

(cherry picked from commit 643d91fe)
parent 35a37158

include/openssl/ssl.h

+8 −8
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ extern "C" { 
# define SSL_TXT_NULL            "NULL"



# define SSL_TXT_kRSA            "kRSA"

# define SSL_TXT_kDHr            "kDHr"

# define SSL_TXT_kDHd            "kDHd"

# define SSL_TXT_kDH             "kDH"

# define SSL_TXT_kDHr            "kDHr"/* this cipher class has been removed */

# define SSL_TXT_kDHd            "kDHd"/* this cipher class has been removed */

# define SSL_TXT_kDH             "kDH"/* this cipher class has been removed */

# define SSL_TXT_kEDH            "kEDH"/* alias for kDHE */

# define SSL_TXT_kDHE            "kDHE"

# define SSL_TXT_kECDHr          "kECDHr"

# define SSL_TXT_kECDHe          "kECDHe"

# define SSL_TXT_kECDH           "kECDH"

# define SSL_TXT_kECDHr          "kECDHr"/* this cipher class has been removed */

# define SSL_TXT_kECDHe          "kECDHe"/* this cipher class has been removed */

# define SSL_TXT_kECDH           "kECDH"/* this cipher class has been removed */

# define SSL_TXT_kEECDH          "kEECDH"/* alias for kECDHE */

# define SSL_TXT_kECDHE          "kECDHE"

# define SSL_TXT_kPSK            "kPSK"
@@ -114,8 +114,8 @@ extern "C" { 


# define SSL_TXT_aRSA            "aRSA"

# define SSL_TXT_aDSS            "aDSS"

# define SSL_TXT_aDH             "aDH"

# define SSL_TXT_aECDH           "aECDH"

# define SSL_TXT_aDH             "aDH"/* this cipher class has been removed */

# define SSL_TXT_aECDH           "aECDH"/* this cipher class has been removed */

# define SSL_TXT_aECDSA          "aECDSA"

# define SSL_TXT_aPSK            "aPSK"

# define SSL_TXT_aGOST94         "aGOST94"

ssl/ssl_ciph.c

+0 −4
Original line number Diff line number Diff line
@@ -1384,10 +1384,6 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, STACK 
    ssl_cipher_apply_rule(0, 0, SSL_aNULL, 0, 0, 0, 0, CIPHER_ORD, -1, &head,

                          &tail);



    /*

     * ssl_cipher_apply_rule(0, 0, SSL_aDH, 0, 0, 0, 0, CIPHER_ORD, -1,

     * &head, &tail);

     */

    ssl_cipher_apply_rule(0, SSL_kRSA, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head,

                          &tail);

    ssl_cipher_apply_rule(0, SSL_kPSK, 0, 0, 0, 0, 0, CIPHER_ORD, -1, &head,

test/recipes/80-test_ssl_old.t

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ sub testssl { 
    subtest "Testing ciphersuites" => sub {



        my @exkeys = ();

        my $ciphers = "-EXP:-PSK:-SRP:-kDH:-kECDHe";

        my $ciphers = "-PSK:-SRP";



        if ($no_dh) {

            note "skipping DHE tests\n";