{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)"}
};
{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[] = {
{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"}
};
*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)
{
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;
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;
return 0;
break;
- case SSL_kEDH:
+ case SSL_kDHE:
if (!ssl_print_hexbuf(bio, indent + 2, "dh_p", 2,
&msg, &msglen))
return 0;
return 0;
break;
- case SSL_kEECDH:
+ case SSL_kECDHE:
if (msglen < 1)
return 0;
BIO_indent(bio, indent + 2, 80);