Add ctrls to clear options and mode.

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 4b27c7f0f5027f285ed9991d5bced98ece377f34..90a3cb8625a80fd6715df73478f96f492e99e8a4 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -669,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";
@@ -723,15 +727,16 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
                {
        case AF_INET:
                length += sizeof(struct in_addr);
+               length += sizeof(peer.s4.sin_port);
                break;
        case AF_INET6:
                length += sizeof(struct in6_addr);
+               length += sizeof(peer.s6.sin6_port);
                break;
        default:
                OPENSSL_assert(0);
                break;
                }
-       length += sizeof(in_port_t);
 #else
        length = sizeof(peer.sin_addr);
        length += sizeof(peer.sin_port);
@@ -750,16 +755,16 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
        case AF_INET:
                memcpy(buffer,
                       &peer.s4.sin_port,
-                      sizeof(in_port_t));
-               memcpy(buffer + sizeof(in_port_t),
+                      sizeof(peer.s4.sin_port));
+               memcpy(buffer + sizeof(peer.s4.sin_port),
                       &peer.s4.sin_addr,
                       sizeof(struct in_addr));
                break;
        case AF_INET6:
                memcpy(buffer,
                       &peer.s6.sin6_port,
-                      sizeof(in_port_t));
-               memcpy(buffer + sizeof(in_port_t),
+                      sizeof(peer.s6.sin6_port));
+               memcpy(buffer + sizeof(peer.s6.sin6_port),
                       &peer.s6.sin6_addr,
                       sizeof(struct in6_addr));
                break;
@@ -811,15 +816,16 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
                {
        case AF_INET:
                length += sizeof(struct in_addr);
+               length += sizeof(peer.s4.sin_port);
                break;
        case AF_INET6:
                length += sizeof(struct in6_addr);
+               length += sizeof(peer.s6.sin6_port);
                break;
        default:
                OPENSSL_assert(0);
                break;
                }
-       length += sizeof(in_port_t);
 #else
        length = sizeof(peer.sin_addr);
        length += sizeof(peer.sin_port);
@@ -838,16 +844,16 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
        case AF_INET:
                memcpy(buffer,
                       &peer.s4.sin_port,
-                      sizeof(in_port_t));
-               memcpy(buffer + sizeof(in_port_t),
+                      sizeof(peer.s4.sin_port));
+               memcpy(buffer + sizeof(peer.s4.sin_port),
                       &peer.s4.sin_addr,
                       sizeof(struct in_addr));
                break;
        case AF_INET6:
                memcpy(buffer,
                       &peer.s6.sin6_port,
-                      sizeof(in_port_t));
-               memcpy(buffer + sizeof(in_port_t),
+                      sizeof(peer.s6.sin6_port));
+               memcpy(buffer + sizeof(peer.s6.sin6_port),
                       &peer.s6.sin6_addr,
                       sizeof(struct in6_addr));
                break;