1
0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00

[ win64 ] HAVE_INET_PTON ifndef

This commit is contained in:
Unknown 2022-04-26 08:45:25 +02:00
parent e2cf1923c4
commit 041c1184ee
2 changed files with 3 additions and 4 deletions

View File

@ -173,7 +173,7 @@ do_real_lookup(char *name, struct sockaddr_storage **addrs, int *addrno,
{ {
struct in_addr inp; struct in_addr inp;
#ifndef WIN32 #ifndef HAVE_INET_PTON
if (is_ip_address(name, strlen(name)) && inet_aton(name, &inp)) if (is_ip_address(name, strlen(name)) && inet_aton(name, &inp))
hostent = gethostbyaddr(&inp, sizeof(inp), AF_INET); hostent = gethostbyaddr(&inp, sizeof(inp), AF_INET);
#else #else

View File

@ -284,7 +284,7 @@ match_uri_host_ip(const char *uri_host,
* network byte order. */ * network byte order. */
switch (ASN1_STRING_length(cert_host_asn1)) { switch (ASN1_STRING_length(cert_host_asn1)) {
case 4: case 4:
#ifndef win32 #ifndef HAVE_INET_PTON
return inet_aton(uri_host, &uri_host_in) != 0 return inet_aton(uri_host, &uri_host_in) != 0
&& memcmp(cert_host_addr, &uri_host_in.s_addr, 4) == 0; && memcmp(cert_host_addr, &uri_host_in.s_addr, 4) == 0;
#else #else
@ -310,7 +310,6 @@ static int
verify_callback(int preverify_ok, X509_STORE_CTX *ctx) verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
{ {
X509_NAME *name;
X509 *cert; X509 *cert;
SSL *ssl; SSL *ssl;
struct socket *socket; struct socket *socket;
@ -362,7 +361,7 @@ verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
sk_GENERAL_NAME_pop_free(alts, GENERAL_NAME_free); sk_GENERAL_NAME_pop_free(alts, GENERAL_NAME_free);
} }
if (!matched && !saw_dns_name) { if (!matched && !saw_dns_name) {
X509_NAME *name;
int cn_index; int cn_index;
X509_NAME_ENTRY *entry = NULL; X509_NAME_ENTRY *entry = NULL;