X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Ft1_trce.c;h=0799a7af51bdfd6d72afd5b26efce6821100e294;hb=9e72d496d4f9880ec98f0ed9168246e35c1c3059;hp=4e03acd089ef2b99f7a2d58a65d9b3178b7dc8ba;hpb=c3b344e36a088283731b4f65a70e85b100f55686;p=openssl.git

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 4e03acd089..0799a7af51 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -365,7 +365,8 @@ static ssl_trace_tbl ssl_exts_tbl[] = {
 	{TLSEXT_TYPE_opaque_prf_input, "opaque_prf_input"},
 #endif
 	{TLSEXT_TYPE_renegotiate, "renegotiate"},
-	{TLSEXT_TYPE_next_proto_neg, "next_proto_neg"}
+	{TLSEXT_TYPE_next_proto_neg, "next_proto_neg"},
+	{TLSEXT_TYPE_padding, "padding"}
 };
 
 static ssl_trace_tbl ssl_curve_tbl[] = {
@@ -394,6 +395,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"}
 };
@@ -807,15 +811,15 @@ static int ssl_get_keyex(const char **pname, SSL *ssl)
 		*pname = "krb5";
 		return SSL_kKRB5;
 		}
-	if (alg_k & SSL_kEDH)
+	if (alg_k & SSL_kDHE)
 		{
-		*pname = "edh";
-		return SSL_kEDH;
+		*pname = "DHE";
+		return SSL_kDHE;
 		}
-	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)
 		{
@@ -882,7 +886,7 @@ static int ssl_print_client_keyex(BIO *bio, int indent, SSL *ssl,
 			BIO_puts(bio, "implicit\n");
 			break;
 			}
-	case SSL_kEDH:
+	case SSL_kDHE:
 		if (!ssl_print_hexbuf(bio, indent + 2, "dh_Yc", 2,
 								&msg, &msglen))
 			return 0;
@@ -896,7 +900,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;
@@ -935,7 +939,7 @@ static int ssl_print_server_keyex(BIO *bio, int indent, SSL *ssl,
 			return 0;
 		break;
 
-	case SSL_kEDH:
+	case SSL_kDHE:
 		if (!ssl_print_hexbuf(bio, indent + 2, "dh_p", 2,
 						&msg, &msglen))
 			return 0;
@@ -947,7 +951,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);