X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Ft1_trce.c;h=2d0a74ce80eb0937fea86d17eac38b2cbf760262;hp=751e0fff5c23fed8b7e1a109a5f717326373e596;hb=0ebc965b9ca4352e407bb7cfa65ac235942117f6;hpb=0be085d34aad30caeecd976d69ca43b0a1c2c5f0

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 751e0fff5c..2d0a74ce80 100644
--- a/ssl/t1_trce.c
+++ b/ssl/t1_trce.c
@@ -810,15 +810,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 = "ECDHE";
-		return SSL_kEECDH;
+		return SSL_kECDHE;
 		}
 	if (alg_k & SSL_kECDHr)
 		{
@@ -885,7 +885,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;
@@ -899,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;
@@ -938,7 +938,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;
@@ -950,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);