Revert "Fix off-by-one errors in ssl_cipher_get_evp()"

[openssl.git] / ssl / t1_trce.c

diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c
index 4e03acd089ef2b99f7a2d58a65d9b3178b7dc8ba..18501519c0fc9537494dd4cf9d1551296af959cb 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[] = {
@@ -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"}
 };