projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Reduce version skew.
[openssl.git] / apps / s_cb.c
diff --git a/apps/s_cb.c b/apps/s_cb.c
index 4d0975ab4166b40c62859a66c1138f2cb565ccf2..160b5bd59da4e333e550fd622fa772f11d5fc78d 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -237,8 +237,8 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
 
                /* If we are using DSA, we can copy the parameters from
                 * the private key */
-               
-               
+
+
                /* Now we know that a key and cert have been set against
                 * the SSL context */
                if (!SSL_CTX_check_private_key(ctx))
@@ -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)
        {
@@ -360,6 +357,12 @@ 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 TLS1_2_VERSION:
+               str_version = "TLS 1.2 ";
+               break;
        case DTLS1_VERSION:
                str_version = "DTLS 1.0 ";
                break;
@@ -552,6 +555,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                case 114:
                                        str_details2 = " bad_certificate_hash_value";
                                        break;
+                               case 115:
+                                       str_details2 = " unknown_psk_identity";
+                                       break;
                                        }
                                }
                        }
@@ -600,6 +606,26 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                        }
                                }
                        }
+
+#ifndef OPENSSL_NO_HEARTBEATS
+               if (content_type == 24) /* Heartbeat */
+                       {
+                       str_details1 = ", Heartbeat";
+                       
+                       if (len > 0)
+                               {
+                               switch (((const unsigned char*)buf)[0])
+                                       {
+                               case 1:
+                                       str_details1 = ", HeartbeatRequest";
+                                       break;
+                               case 2:
+                                       str_details1 = ", HeartbeatResponse";
+                                       break;
+                                       }
+                               }
+                       }
+#endif
                }
 
        BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version, str_content_type, (unsigned long)len, str_details1, str_details2);
@@ -660,6 +686,22 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                extname = "status request";
                break;
 
+               case TLSEXT_TYPE_user_mapping:
+               extname = "user mapping";
+               break;
+
+               case TLSEXT_TYPE_client_authz:
+               extname = "client authz";
+               break;
+
+               case TLSEXT_TYPE_server_authz:
+               extname = "server authz";
+               break;
+
+               case TLSEXT_TYPE_cert_type:
+               extname = "cert type";
+               break;
+
                case TLSEXT_TYPE_elliptic_curves:
                extname = "elliptic curves";
                break;
@@ -668,8 +710,28 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                extname = "EC point formats";
                break;
 
+               case TLSEXT_TYPE_srp:
+               extname = "SRP";
+               break;
+
+               case TLSEXT_TYPE_signature_algorithms:
+               extname = "signature algorithms";
+               break;
+
+               case TLSEXT_TYPE_use_srtp:
+               extname = "use SRTP";
+               break;
+
+               case TLSEXT_TYPE_heartbeat:
+               extname = "heartbeat";
+               break;
+
                case TLSEXT_TYPE_session_ticket:
-               extname = "server ticket";
+               extname = "session ticket";
+               break;
+
+               case TLSEXT_TYPE_renegotiate: 
+               extname = "renegotiation info";
                break;
 
 #ifdef TLSEXT_TYPE_opaque_prf_input
@@ -677,6 +739,11 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                extname = "opaque PRF input";
                break;
 #endif
+#ifdef TLSEXT_TYPE_next_proto_neg
+               case TLSEXT_TYPE_next_proto_neg:
+               extname = "next protocol";
+               break;
+#endif
 
                default:
                extname = "unknown";
@@ -695,15 +762,13 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
        {
        unsigned char *buffer, result[EVP_MAX_MD_SIZE];
        unsigned int length, resultlength;
-#if OPENSSL_USE_IPV6
        union {
-               struct sockaddr_storage ss;
-               struct sockaddr_in6 s6;
+               struct sockaddr sa;
                struct sockaddr_in s4;
-       } peer;
-#else
-       struct sockaddr_in peer;
+#if OPENSSL_USE_IPV6
+               struct sockaddr_in6 s6;
 #endif
+       } peer;
 
        /* Initialize a random secret */
        if (!cookie_initialized)
@@ -720,26 +785,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 */
-#if OPENSSL_USE_IPV6
        length = 0;
-       switch (peer.ss.ss_family)
+       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;
                }
-#else
-       length = sizeof(peer.sin_addr);
-       length += sizeof(peer.sin_port);
-#endif
        buffer = OPENSSL_malloc(length);
 
        if (buffer == NULL)
@@ -748,8 +810,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
                return 0;
                }
 
-#if OPENSSL_USE_IPV6
-       switch (peer.ss.ss_family)
+       switch (peer.sa.sa_family)
                {
        case AF_INET:
                memcpy(buffer,
@@ -759,6 +820,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
                       &peer.s4.sin_addr,
                       sizeof(struct in_addr));
                break;
+#if OPENSSL_USE_IPV6
        case AF_INET6:
                memcpy(buffer,
                       &peer.s6.sin6_port,
@@ -767,14 +829,11 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
                       &peer.s6.sin6_addr,
                       sizeof(struct in6_addr));
                break;
+#endif
        default:
                OPENSSL_assert(0);
                break;
                }
-#else
-       memcpy(buffer, &peer.sin_port, sizeof(peer.sin_port));
-       memcpy(buffer + sizeof(peer.sin_port), &peer.sin_addr, sizeof(peer.sin_addr));
-#endif
 
        /* Calculate HMAC of buffer using the secret */
        HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
@@ -791,15 +850,13 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
        {
        unsigned char *buffer, result[EVP_MAX_MD_SIZE];
        unsigned int length, resultlength;
-#if OPENSSL_USE_IPV6
        union {
-               struct sockaddr_storage ss;
-               struct sockaddr_in6 s6;
+               struct sockaddr sa;
                struct sockaddr_in s4;
-       } peer;
-#else
-       struct sockaddr_in peer;
+#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)
@@ -809,26 +866,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 */
-#if OPENSSL_USE_IPV6
        length = 0;
-       switch (peer.ss.ss_family)
+       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;
                }
-#else
-       length = sizeof(peer.sin_addr);
-       length += sizeof(peer.sin_port);
-#endif
        buffer = OPENSSL_malloc(length);
        
        if (buffer == NULL)
@@ -837,8 +891,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
                return 0;
                }
 
-#if OPENSSL_USE_IPV6
-       switch (peer.ss.ss_family)
+       switch (peer.sa.sa_family)
                {
        case AF_INET:
                memcpy(buffer,
@@ -848,6 +901,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
                       &peer.s4.sin_addr,
                       sizeof(struct in_addr));
                break;
+#if OPENSSL_USE_IPV6
        case AF_INET6:
                memcpy(buffer,
                       &peer.s6.sin6_port,
@@ -856,14 +910,11 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
                       &peer.s6.sin6_addr,
                       sizeof(struct in6_addr));
                break;
+#endif
        default:
                OPENSSL_assert(0);
                break;
                }
-#else
-       memcpy(buffer, &peer.sin_port, sizeof(peer.sin_port));
-       memcpy(buffer + sizeof(peer.sin_port), &peer.sin_addr, sizeof(peer.sin_addr));
-#endif
 
        /* Calculate HMAC of buffer using the secret */
        HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
Unnamed repository; edit this file 'description' to name the repository.