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;
case 114:
str_details2 = " bad_certificate_hash_value";
break;
+ case 115:
+ str_details2 = " unknown_psk_identity";
+ break;
}
}
}
}
}
}
+
+#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);
extname = "server ticket";
break;
+ case TLSEXT_TYPE_renegotiate:
+ extname = "renegotiate";
+ break;
+
+ case TLSEXT_TYPE_signature_algorithms:
+ extname = "signature algorithms";
+ break;
+
#ifdef TLSEXT_TYPE_opaque_prf_input
case TLSEXT_TYPE_opaque_prf_input:
extname = "opaque PRF input";
{
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)
(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;
}
- length += sizeof(in_port_t);
-#else
- length = sizeof(peer.sin_addr);
- length += sizeof(peer.sin_port);
-#endif
buffer = OPENSSL_malloc(length);
if (buffer == NULL)
return 0;
}
-#if OPENSSL_USE_IPV6
- switch (peer.ss.ss_family)
+ switch (peer.sa.sa_family)
{
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;
+#if OPENSSL_USE_IPV6
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;
+#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,
{
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)
(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;
}
- length += sizeof(in_port_t);
-#else
- length = sizeof(peer.sin_addr);
- length += sizeof(peer.sin_port);
-#endif
buffer = OPENSSL_malloc(length);
if (buffer == NULL)
return 0;
}
-#if OPENSSL_USE_IPV6
- switch (peer.ss.ss_family)
+ switch (peer.sa.sa_family)
{
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;
+#if OPENSSL_USE_IPV6
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;
+#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,