Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
11 个月 前同步成功

通知 8
Star 18
Fork 1
T
Third Party Openssl

体验新版 GitCode，发现更多精彩内容 >>

提交 cba9ffc3 编写于 作者: A Andy Polyakov
浏览文件
操作

Fix compilation on older Linux. Linux didn't always have sockaddr_storage, 

not to mention that first sockaddr_storage had __ss_family, not ss_family.
In other words it makes more sense to avoid sockaddr_storage...
上级 76998a71
隐藏空白更改
内联 并排
Showing with 37 addition and 47 deletion
apps/s_cb.c
浏览文件 @ cba9ffc3
...@@ -696,15 +696,13 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign ...@@ -696,15 +696,13 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
{ {
unsigned char *buffer, result[EVP_MAX_MD_SIZE]; unsigned char *buffer, result[EVP_MAX_MD_SIZE];
unsigned int length, resultlength; unsigned int length, resultlength;
#if OPENSSL_USE_IPV6
union { union {
struct sockaddr_storage ss; struct sockaddr sa;
struct sockaddr_in6 s6;
struct sockaddr_in s4; struct sockaddr_in s4;
} peer; #if OPENSSL_USE_IPV6
#else struct sockaddr_in6 s6;
struct sockaddr_in peer;
#endif #endif
} peer;
/* Initialize a random secret */ /* Initialize a random secret */
if (!cookie_initialized) if (!cookie_initialized)
...@@ -721,26 +719,23 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign ...@@ -721,26 +719,23 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
(void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer); (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
/* Create buffer with peer's address and port */ /* Create buffer with peer's address and port */
#if OPENSSL_USE_IPV6
length = 0; length = 0;
switch (peer.ss.ss_family) switch (peer.sa.sa_family)
{ {
case AF_INET: case AF_INET:
length += sizeof(struct in_addr); length += sizeof(struct in_addr);
length += sizeof(peer.s4.sin_port); length += sizeof(peer.s4.sin_port);
break; break;
#if OPENSSL_USE_IPV6
case AF_INET6: case AF_INET6:
length += sizeof(struct in6_addr); length += sizeof(struct in6_addr);
length += sizeof(peer.s6.sin6_port); length += sizeof(peer.s6.sin6_port);
break; break;
#endif
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; break;
} }
#else
length = sizeof(peer.sin_addr);
length += sizeof(peer.sin_port);
#endif
buffer = OPENSSL_malloc(length); buffer = OPENSSL_malloc(length);
if (buffer == NULL) if (buffer == NULL)
...@@ -749,8 +744,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign ...@@ -749,8 +744,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
return 0; return 0;
} }
#if OPENSSL_USE_IPV6 switch (peer.sa.sa_family)
switch (peer.ss.ss_family)
{ {
case AF_INET: case AF_INET:
memcpy(buffer, memcpy(buffer,
...@@ -760,6 +754,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign ...@@ -760,6 +754,7 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
&peer.s4.sin_addr, &peer.s4.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
break; break;
#if OPENSSL_USE_IPV6
case AF_INET6: case AF_INET6:
memcpy(buffer, memcpy(buffer,
&peer.s6.sin6_port, &peer.s6.sin6_port,
...@@ -768,14 +763,11 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign ...@@ -768,14 +763,11 @@ int MS_CALLBACK generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsign
&peer.s6.sin6_addr, &peer.s6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;
#endif
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; 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 */ /* Calculate HMAC of buffer using the secret */
HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH, HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
...@@ -792,15 +784,13 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned ...@@ -792,15 +784,13 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
{ {
unsigned char *buffer, result[EVP_MAX_MD_SIZE]; unsigned char *buffer, result[EVP_MAX_MD_SIZE];
unsigned int length, resultlength; unsigned int length, resultlength;
#if OPENSSL_USE_IPV6
union { union {
struct sockaddr_storage ss; struct sockaddr sa;
struct sockaddr_in6 s6;
struct sockaddr_in s4; struct sockaddr_in s4;
} peer; #if OPENSSL_USE_IPV6
#else struct sockaddr_in6 s6;
struct sockaddr_in peer;
#endif #endif
} peer;
/* If secret isn't initialized yet, the cookie can't be valid */ /* If secret isn't initialized yet, the cookie can't be valid */
if (!cookie_initialized) if (!cookie_initialized)
...@@ -810,26 +800,23 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned ...@@ -810,26 +800,23 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
(void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer); (void)BIO_dgram_get_peer(SSL_get_rbio(ssl), &peer);
/* Create buffer with peer's address and port */ /* Create buffer with peer's address and port */
#if OPENSSL_USE_IPV6
length = 0; length = 0;
switch (peer.ss.ss_family) switch (peer.sa.sa_family)
{ {
case AF_INET: case AF_INET:
length += sizeof(struct in_addr); length += sizeof(struct in_addr);
length += sizeof(peer.s4.sin_port); length += sizeof(peer.s4.sin_port);
break; break;
#if OPENSSL_USE_IPV6
case AF_INET6: case AF_INET6:
length += sizeof(struct in6_addr); length += sizeof(struct in6_addr);
length += sizeof(peer.s6.sin6_port); length += sizeof(peer.s6.sin6_port);
break; break;
#endif
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; break;
} }
#else
length = sizeof(peer.sin_addr);
length += sizeof(peer.sin_port);
#endif
buffer = OPENSSL_malloc(length); buffer = OPENSSL_malloc(length);
if (buffer == NULL) if (buffer == NULL)
...@@ -838,8 +825,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned ...@@ -838,8 +825,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
return 0; return 0;
} }
#if OPENSSL_USE_IPV6 switch (peer.sa.sa_family)
switch (peer.ss.ss_family)
{ {
case AF_INET: case AF_INET:
memcpy(buffer, memcpy(buffer,
...@@ -849,6 +835,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned ...@@ -849,6 +835,7 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
&peer.s4.sin_addr, &peer.s4.sin_addr,
sizeof(struct in_addr)); sizeof(struct in_addr));
break; break;
#if OPENSSL_USE_IPV6
case AF_INET6: case AF_INET6:
memcpy(buffer, memcpy(buffer,
&peer.s6.sin6_port, &peer.s6.sin6_port,
...@@ -857,14 +844,11 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned ...@@ -857,14 +844,11 @@ int MS_CALLBACK verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned
&peer.s6.sin6_addr, &peer.s6.sin6_addr,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
break; break;
#endif
default: default:
OPENSSL_assert(0); OPENSSL_assert(0);
break; 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 */ /* Calculate HMAC of buffer using the secret */
HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH, HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH,
......
crypto/bio/bss_dgram.c
浏览文件 @ cba9ffc3
...@@ -371,7 +371,13 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -371,7 +371,13 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
#endif #endif
#ifdef OPENSSL_SYS_LINUX #ifdef OPENSSL_SYS_LINUX
socklen_t addr_len; socklen_t addr_len;
struct sockaddr_storage addr; union {
struct sockaddr sa;
struct sockaddr_in s4;
#if OPENSSL_USE_IPV6
struct sockaddr_in6 s6;
#endif
} addr;
#endif #endif
data = (bio_dgram_data *)b->ptr; data = (bio_dgram_data *)b->ptr;
...@@ -446,15 +452,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -446,15 +452,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
/* (Linux)kernel sets DF bit on outgoing IP packets */ /* (Linux)kernel sets DF bit on outgoing IP packets */
case BIO_CTRL_DGRAM_MTU_DISCOVER: case BIO_CTRL_DGRAM_MTU_DISCOVER:
#ifdef OPENSSL_SYS_LINUX #ifdef OPENSSL_SYS_LINUX
addr_len = (socklen_t)sizeof(struct sockaddr_storage); addr_len = (socklen_t)sizeof(addr);
memset((void *)&addr, 0, sizeof(struct sockaddr_storage)); memset((void *)&addr, 0, sizeof(addr));
if (getsockname(b->num, (void *)&addr, &addr_len) < 0) if (getsockname(b->num, &addr.sa, &addr_len) < 0)
{ {
ret = 0; ret = 0;
break; break;
} }
sockopt_len = sizeof(sockopt_val); sockopt_len = sizeof(sockopt_val);
switch (addr.ss_family) switch (addr.sa.sa_family)
{ {
case AF_INET: case AF_INET:
sockopt_val = IP_PMTUDISC_DO; sockopt_val = IP_PMTUDISC_DO;
...@@ -462,7 +468,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -462,7 +468,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
&sockopt_val, sizeof(sockopt_val))) < 0) &sockopt_val, sizeof(sockopt_val))) < 0)
perror("setsockopt"); perror("setsockopt");
break; break;
#if OPENSSL_USE_IPV6 #if OPENSSL_USE_IPV6 && defined(IPV6_MTU_DISCOVER)
case AF_INET6: case AF_INET6:
sockopt_val = IPV6_PMTUDISC_DO; sockopt_val = IPV6_PMTUDISC_DO;
if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER, if ((ret = setsockopt(b->num, IPPROTO_IPV6, IPV6_MTU_DISCOVER,
...@@ -480,15 +486,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -480,15 +486,15 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
#endif #endif
case BIO_CTRL_DGRAM_QUERY_MTU: case BIO_CTRL_DGRAM_QUERY_MTU:
#ifdef OPENSSL_SYS_LINUX #ifdef OPENSSL_SYS_LINUX
addr_len = (socklen_t)sizeof(struct sockaddr_storage); addr_len = (socklen_t)sizeof(addr);
memset((void *)&addr, 0, sizeof(struct sockaddr_storage)); memset((void *)&addr, 0, sizeof(addr));
if (getsockname(b->num, (void *)&addr, &addr_len) < 0) if (getsockname(b->num, &addr.sa, &addr_len) < 0)
{ {
ret = 0; ret = 0;
break; break;
} }
sockopt_len = sizeof(sockopt_val); sockopt_len = sizeof(sockopt_val);
switch (addr.ss_family) switch (addr.sa.sa_family)
{ {
case AF_INET: case AF_INET:
if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val, if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
...@@ -505,7 +511,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr) ...@@ -505,7 +511,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = data->mtu; ret = data->mtu;
} }
break; break;
#if OPENSSL_USE_IPV6 #if OPENSSL_USE_IPV6 && defined(IPV6_MTU)
case AF_INET6: case AF_INET6:
if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val, if ((ret = getsockopt(b->num, IPPROTO_IPV6, IPV6_MTU, (void *)&sockopt_val,
&sockopt_len)) < 0 || sockopt_val < 0) &sockopt_len)) < 0 || sockopt_val < 0)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或