add missing parts of reneg port, fix apps patch

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 4d0975ab4166b40c62859a66c1138f2cb565ccf2..90a3cb8625a80fd6715df73478f96f492e99e8a4 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -338,9 +338,6 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
                }
        }
 
-               case TLSEXT_TYPE_renegotiate:
-               extname = "renegotiate";
-               break;
 
 void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
        {
@@ -672,6 +669,10 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                extname = "server ticket";
                break;
 
+               case TLSEXT_TYPE_renegotiate:
+               extname = "renegotiate";
+               break;
+
 #ifdef TLSEXT_TYPE_opaque_prf_input
                case TLSEXT_TYPE_opaque_prf_input:
                extname = "opaque PRF input";