Allow "DHE" and "kDHE" as synonyms of "EDH" and "kEDH" when specifiying ciphers

[openssl.git] / ssl / t1_trce.c

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index e766095a631ccabea707468b7213e8f09c34ad7d..4552c99ede3db789d334c19e23e52c1d8b0a2a06 100644 (file)
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -112,6 +112,7 @@ static ssl_trace_tbl ssl_version_tbl[] = {
        {TLS1_1_VERSION,        "TLS 1.1"},
        {TLS1_2_VERSION,        "TLS 1.2"},
        {DTLS1_VERSION,         "DTLS 1.0"},
+       {DTLS1_2_VERSION,       "DTLS 1.2"},
        {DTLS1_BAD_VER,         "DTLS 1.0 (bad)"}
 };
 
@@ -393,6 +394,9 @@ static ssl_trace_tbl ssl_curve_tbl[] = {
        {23, "secp256r1 (P-256)"},
        {24, "secp384r1 (P-384)"},
        {25, "secp521r1 (P-521)"},
+       {26, "brainpoolP256r1"},
+       {27, "brainpoolP384r1"},
+       {28, "brainpoolP512r1"},
        {0xFF01, "arbitrary_explicit_prime_curves"},
        {0xFF02, "arbitrary_explicit_char2_curves"}
 };
@@ -531,7 +535,7 @@ static int ssl_print_signature(BIO *bio, int indent, SSL *s,
        {
        if (*pmsglen < 2)
                return 0;
-       if (TLS1_get_version(s) >= TLS1_2_VERSION)
+       if (SSL_USE_SIGALGS(s))
                {
                const unsigned char *p = *pmsg;
                BIO_indent(bio, indent, 80);
@@ -811,10 +815,10 @@ static int ssl_get_keyex(const char **pname, SSL *ssl)
                *pname = "edh";
                return SSL_kEDH;
                }
-       if (alg_k & SSL_kEECDH)
+       if (alg_k & SSL_kECDHE)
                {
-               *pname = "EECDH";
-               return SSL_kEECDH;
+               *pname = "ECDHE";
+               return SSL_kECDHE;
                }
        if (alg_k & SSL_kECDHr)
                {
@@ -895,7 +899,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl,
                        BIO_puts(bio, "implicit\n");
                        break;
                        }
-       case SSL_kEECDH:
+       case SSL_kECDHE:
                if (!ssl_print_hexbuf(bio, indent + 2, "ecdh_Yc", 1,
                                                        &msg, &msglen))
                        return 0;
@@ -946,7 +950,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
                        return 0;
                break;
 
-       case SSL_kEECDH:
+       case SSL_kECDHE:
                if (msglen < 1)
                        return 0;
                BIO_indent(bio, indent + 2, 80);
@@ -1046,7 +1050,7 @@ static int ssl_print_cert_request(BIO *bio, int indent, SSL *s,
                return 0;
        msg += xlen;
        msglen -= xlen + 1;
-       if (TLS1_get_version(s) < TLS1_2_VERSION)
+       if (!SSL_USE_SIGALGS(s))
                goto skip_sig;
        if (msglen < 2)
                return 0;