Adding padding extension to trace code.

[openssl.git] / ssl / t1_trce.c

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