ae419bb Update libfetch to the latest version — HardenedBSD-pkg

modified external/libfetch/common.c

@@ -263,8 +263,11 @@ fetch_bind(int sd, int af, const char *addr)

 	if ((err = getaddrinfo(addr, NULL, &hints, &res0)) != 0)
 		return (-1);
 	for (res = res0; res; res = res->ai_next)
 		if (bind(sd, res->ai_addr, res->ai_addrlen) == 0)
 		if (bind(sd, res->ai_addr, res->ai_addrlen) == 0) {
 			freeaddrinfo(res0);
 			return (0);
 		}
 	freeaddrinfo(res0);
 	return (-1);
 }

@@ -478,7 +481,7 @@ fetch_ssl_hname_match(const char *h, size_t hlen, const char *m,

 	if (!fetch_ssl_hname_equal(hdot - delta, delta,
 	    mdot1 - delta, delta))
 		return (0);
 	/* all tests succeded, it's a match */
 	/* all tests succeeded, it's a match */
 	return (1);
 }

modified external/libfetch/file.c

@@ -150,5 +150,6 @@ fetchListFile(struct url *u, const char *flags __unused)

 		fetch_add_entry(&ue, &size, &len, de->d_name, &us);
 	}
 	closedir(dir);
 	return (ue);
 }

modified external/libfetch/ftp.c

@@ -488,7 +488,7 @@ struct ftpio {

 static int	 ftp_readfn(void *, char *, int);
 static int	 ftp_writefn(void *, const char *, int);
 static off_t	 ftp_seekfn(void *, off_t, int);
 static fpos_t	 ftp_seekfn(void *, fpos_t, int);
 static int	 ftp_closefn(void *);
 static int

@@ -551,18 +551,18 @@ ftp_writefn(void *v, const char *buf, int len)

 	return (-1);
 }
 static off_t
 ftp_seekfn(void *v, off_t pos __unused, int whence __unused)
 static fpos_t
 ftp_seekfn(void *v, fpos_t pos __unused, int whence __unused)
 {
 	struct ftpio *io;
 	io = (struct ftpio *)v;
 	if (io == NULL) {
 		errno = EBADF;
 		return ((off_t)-1);
 		return (-1);
 	}
 	errno = ESPIPE;
 	return ((off_t)-1);
 	return (-1);
 }
 static int

@@ -772,7 +772,7 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,

 		if (bindaddr != NULL && *bindaddr != '\0' &&
 		    fetch_bind(sd, sa.ss_family, bindaddr) != 0)
 			goto sysouch;
 		if (connect(sd, (struct sockaddr *)&sa, l) == -1)
 		if (connect(sd, (struct sockaddr *)&sa, sa.ss_len) == -1)
 			goto sysouch;
 		/* make the server initiate the transfer */

@@ -786,14 +786,12 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,

 		u_int32_t a;
 		u_short p;
 		int arg, d;
 		socklen_t sslen;
 		char *ap;
 		char hname[INET6_ADDRSTRLEN];
 		switch (sa.ss_family) {
 		case AF_INET6:
 			((struct sockaddr_in6 *)&sa)->sin6_port = 0;
 			sslen = sizeof(struct sockaddr_in6);
 #ifdef IPV6_PORTRANGE
 			arg = low ? IPV6_PORTRANGE_DEFAULT : IPV6_PORTRANGE_HIGH;
 			if (setsockopt(sd, IPPROTO_IPV6, IPV6_PORTRANGE,

@@ -803,7 +801,6 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,

 			break;
 		case AF_INET:
 			((struct sockaddr_in *)&sa)->sin_port = 0;
 			sslen = sizeof(struct sockaddr_in);
 #ifdef IP_PORTRANGE
 			arg = low ? IP_PORTRANGE_DEFAULT : IP_PORTRANGE_HIGH;
 			if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE,

@@ -814,7 +811,7 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,

 		}
 		if (verbose)
 			fetch_info("binding data socket");
 		if (bind(sd, (struct sockaddr *)&sa, sslen) == -1)
 		if (bind(sd, (struct sockaddr *)&sa, sa.ss_len) == -1)
 			goto sysouch;
 		if (listen(sd, 1) == -1)
 			goto sysouch;

@@ -837,7 +834,7 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file,

 			e = -1;
 			sin6 = (struct sockaddr_in6 *)&sa;
 			sin6->sin6_scope_id = 0;
 			if (getnameinfo((struct sockaddr *)&sa, sizeof(struct sockaddr_in6),
 			if (getnameinfo((struct sockaddr *)&sa, sa.ss_len,
 				hname, sizeof(hname),
 				NULL, 0, NI_NUMERICHOST) == 0) {
 				e = ftp_cmd(conn, "EPRT |%d|%s|%d|", 2, hname,

@@ -936,7 +933,7 @@ ftp_authenticate(conn_t *conn, struct url *url, struct url *purl)

 		if (*pwd == '\0')
 			pwd = getenv("FTP_PASSWORD");
 		if (pwd == NULL || *pwd == '\0') {
 			if ((logname = getlogin()) == 0)
 			if ((logname = getlogin()) == NULL)
 				logname = FTP_ANONYMOUS_USER;
 			if ((len = snprintf(pbuf, MAXLOGNAME + 1, "%s@", logname)) < 0)
 				len = 0;

modified external/libfetch/http.c

@@ -114,6 +114,7 @@

 #define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \
 			    || (xyz) == HTTP_MOVED_TEMP \
 			    || (xyz) == HTTP_TEMP_REDIRECT \
 			    || (xyz) == HTTP_PERM_REDIRECT \
 			    || (xyz) == HTTP_USE_PROXY \
 			    || (xyz) == HTTP_SEE_OTHER)

@@ -875,7 +876,7 @@ http_parse_mtime(const char *p, time_t *mtime)

 	char locale[64], *r;
 	struct tm tm;
 	strncpy(locale, setlocale(LC_TIME, NULL), sizeof(locale));
 	strlcpy(locale, setlocale(LC_TIME, NULL), sizeof(locale));
 	setlocale(LC_TIME, "C");
 	r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm);
 	/*

@@ -1770,6 +1771,8 @@ http_request_body(struct url *URL, const char *op, struct url_stat *us,

 			break;
 		case HTTP_MOVED_PERM:
 		case HTTP_MOVED_TEMP:
 		case HTTP_TEMP_REDIRECT:
 		case HTTP_PERM_REDIRECT:
 		case HTTP_SEE_OTHER:
 		case HTTP_USE_PROXY:
 			/*