Make fipscanisteronly work with WIN32 build system.

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index d92f43d52ae07b2b16954e7d50de4e7ee069bc1b..dd9de4663cdaec682a0cd50952b3b3cb7098c979 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -357,6 +357,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
        case TLS1_VERSION:
                str_version = "TLS 1.0 ";
                break;
+       case TLS1_1_VERSION:
+               str_version = "TLS 1.1 ";
+               break;
        case DTLS1_VERSION:
                str_version = "DTLS 1.0 ";
                break;
@@ -669,6 +672,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";
@@ -692,8 +699,14 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
        {
        unsigned char *buffer, result[EVP_MAX_MD_SIZE];
        unsigned int length, resultlength;
-       struct sockaddr_in peer;
-       
+       union {
+               struct sockaddr sa;
+               struct sockaddr_in s4;
+#if OPENSSL_USE_IPV6
+               struct sockaddr_in6 s6;
+#endif
+       } peer;
+
        /* Initialize a random secret */
        if (!cookie_initialized)
                {
@@ -709,8 +722,23 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
        (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
 
        /* Create buffer with peer's address and port */
-       length = sizeof(peer.sin_addr);
-       length += sizeof(peer.sin_port);
+       length = 0;
+       switch (peer.sa.sa_family)
+               {
+       case AF_INET:
+               length += sizeof(struct in_addr);
+               length += sizeof(peer.s4.sin_port);
+               break;
+#if OPENSSL_USE_IPV6
+       case AF_INET6:
+               length += sizeof(struct in6_addr);
+               length += sizeof(peer.s6.sin6_port);
+               break;
+#endif
+       default:
+               OPENSSL_assert(0);
+               break;
+               }
        buffer = OPENSSL_malloc(length);
 
        if (buffer == NULL)
@@ -718,9 +746,31 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
                BIO_printf(bio_err,"out of memory\n");
                return 0;
                }
-       
-       memcpy(buffer, &peer.sin_addr, sizeof(peer.sin_addr));
-       memcpy(buffer + sizeof(peer.sin_addr), &peer.sin_port, sizeof(peer.sin_port));
+
+       switch (peer.sa.sa_family)
+               {
+       case AF_INET:
+               memcpy(buffer,
+                      &peer.s4.sin_port,
+                      sizeof(peer.s4.sin_port));
+               memcpy(buffer + sizeof(peer.s4.sin_port),
+                      &peer.s4.sin_addr,
+                      sizeof(struct in_addr));
+               break;
+#if OPENSSL_USE_IPV6
+       case AF_INET6:
+               memcpy(buffer,
+                      &peer.s6.sin6_port,
+                      sizeof(peer.s6.sin6_port));
+               memcpy(buffer + sizeof(peer.s6.sin6_port),
+                      &peer.s6.sin6_addr,
+                      sizeof(struct in6_addr));
+               break;
+#endif
+       default:
+               OPENSSL_assert(0);
+               break;
+               }
 
        /* Calculate HMAC of buffer using the secret */
        HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
@@ -737,8 +787,14 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
        {
        unsigned char *buffer, result[EVP_MAX_MD_SIZE];
        unsigned int length, resultlength;
-       struct sockaddr_in peer;
-       
+       union {
+               struct sockaddr sa;
+               struct sockaddr_in s4;
+#if OPENSSL_USE_IPV6
+               struct sockaddr_in6 s6;
+#endif
+       } peer;
+
        /* If secret isn't initialized yet, the cookie can't be valid */
        if (!cookie_initialized)
                return 0;
@@ -747,8 +803,23 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
        (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
 
        /* Create buffer with peer's address and port */
-       length = sizeof(peer.sin_addr);
-       length += sizeof(peer.sin_port);
+       length = 0;
+       switch (peer.sa.sa_family)
+               {
+       case AF_INET:
+               length += sizeof(struct in_addr);
+               length += sizeof(peer.s4.sin_port);
+               break;
+#if OPENSSL_USE_IPV6
+       case AF_INET6:
+               length += sizeof(struct in6_addr);
+               length += sizeof(peer.s6.sin6_port);
+               break;
+#endif
+       default:
+               OPENSSL_assert(0);
+               break;
+               }
        buffer = OPENSSL_malloc(length);
        
        if (buffer == NULL)
@@ -756,15 +827,37 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
                BIO_printf(bio_err,"out of memory\n");
                return 0;
                }
-       
-       memcpy(buffer, &peer.sin_addr, sizeof(peer.sin_addr));
-       memcpy(buffer + sizeof(peer.sin_addr), &peer.sin_port, sizeof(peer.sin_port));
+
+       switch (peer.sa.sa_family)
+               {
+       case AF_INET:
+               memcpy(buffer,
+                      &peer.s4.sin_port,
+                      sizeof(peer.s4.sin_port));
+               memcpy(buffer + sizeof(peer.s4.sin_port),
+                      &peer.s4.sin_addr,
+                      sizeof(struct in_addr));
+               break;
+#if OPENSSL_USE_IPV6
+       case AF_INET6:
+               memcpy(buffer,
+                      &peer.s6.sin6_port,
+                      sizeof(peer.s6.sin6_port));
+               memcpy(buffer + sizeof(peer.s6.sin6_port),
+                      &peer.s6.sin6_addr,
+                      sizeof(struct in6_addr));
+               break;
+#endif
+       default:
+               OPENSSL_assert(0);
+               break;
+               }
 
        /* Calculate HMAC of buffer using the secret */
        HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
             buffer, length, result, &resultlength);
        OPENSSL_free(buffer);
-       
+
        if (cookie_len == resultlength && memcmp(result, cookie, resultlength) == 0)
                return 1;