generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for WIN32 (and possibly other platforms) which don't define in_port_t.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2009-10-15 18:48:47 +00:00
parent b381e9b952
commit 595e804ae3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/s_cb.c
View File

@@ -723,15 +723,16 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
{ {
case AF_INET: case AF_INET:
length += sizeof(struct in_addr); length += sizeof(struct in_addr);
length += sizeof(peer.s4.sin_port);
break; break;
case AF_INET6: case AF_INET6:
length += sizeof(struct in6_addr); length += sizeof(struct in6_addr);
length += sizeof(peer.s6.sin6_port);
break; break;
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; break;
} }
length += sizeof(in_port_t);
#else #else
length = sizeof(peer.sin_addr); length = sizeof(peer.sin_addr);
length += sizeof(peer.sin_port); length += sizeof(peer.sin_port);
@@ -750,16 +751,16 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
case AF_INET: case AF_INET:
memcpy(buffer, memcpy(buffer,
&peer.s4.sin_port, &peer.s4.sin_port,
sizeof(in_port_t)); sizeof(peer.s4.sin_port));
memcpy(buffer + sizeof(in_port_t), memcpy(buffer + sizeof(peer.s4.sin_port),
&peer.s4.sin_addr, &peer.s4.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
break; break;
case AF_INET6: case AF_INET6:
memcpy(buffer, memcpy(buffer,
&peer.s6.sin6_port, &peer.s6.sin6_port,
sizeof(in_port_t)); sizeof(peer.s6.sin6_port));
memcpy(buffer + sizeof(in_port_t), memcpy(buffer + sizeof(peer.s6.sin6_port),
&peer.s6.sin6_addr, &peer.s6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;
@@ -811,15 +812,16 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
{ {
case AF_INET: case AF_INET:
length += sizeof(struct in_addr); length += sizeof(struct in_addr);
length += sizeof(peer.s4.sin_port);
break; break;
case AF_INET6: case AF_INET6:
length += sizeof(struct in6_addr); length += sizeof(struct in6_addr);
length += sizeof(peer.s6.sin6_port);
break; break;
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; break;
} }
length += sizeof(in_port_t);
#else #else
length = sizeof(peer.sin_addr); length = sizeof(peer.sin_addr);
length += sizeof(peer.sin_port); length += sizeof(peer.sin_port);
@@ -838,16 +840,16 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
case AF_INET: case AF_INET:
memcpy(buffer, memcpy(buffer,
&peer.s4.sin_port, &peer.s4.sin_port,
sizeof(in_port_t)); sizeof(peer.s4.sin_port));
memcpy(buffer + sizeof(in_port_t), memcpy(buffer + sizeof(peer.s4.sin_port),
&peer.s4.sin_addr, &peer.s4.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
break; break;
case AF_INET6: case AF_INET6:
memcpy(buffer, memcpy(buffer,
&peer.s6.sin6_port, &peer.s6.sin6_port,
sizeof(in_port_t)); sizeof(peer.s6.sin6_port));
memcpy(buffer + sizeof(in_port_t), memcpy(buffer + sizeof(peer.s6.sin6_port),
&peer.s6.sin6_addr, &peer.s6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;