emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: fix openssl options for cert verification

Browse Source 
function                                             old     new   delta
is_ip_address                                          -      54     +54
spawn_https_helper_openssl                           461     486     +25
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 1/0 up/down: 79/0)               Total: 79 bytes

Signed-off-by: Scott Court <z5t1@z5t1.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Scott Court 2020-06-29 14:30:12 +02:00 committed by Denys Vlasenko
parent 79bd7c3f7b
commit fc2ce04a38
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
networking/wget.c
View File

@ -673,7 +673,8 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
pid = xvfork(); pid = xvfork();
if (pid == 0) { if (pid == 0) {
/* Child */ /* Child */
char *argv[9]; char *argv[13];
char **argp;
close(sp[0]); close(sp[0]);
xmove_fd(sp[1], 0); xmove_fd(sp[1], 0);
@ -696,13 +697,25 @@ static int spawn_https_helper_openssl(const char *host, unsigned port)
* TLS server_name (SNI) field are FQDNs (DNS hostnames). * TLS server_name (SNI) field are FQDNs (DNS hostnames).
* IPv4 and IPv6 addresses, port numbers are not allowed. * IPv4 and IPv6 addresses, port numbers are not allowed.
*/ */
argp = &argv[5];
if (!is_ip_address(servername)) { if (!is_ip_address(servername)) {
argv[5] = (char*)"-servername"; *argp++ = (char*)"-servername"; //[5]
argv[6] = (char*)servername; *argp++ = (char*)servername; //[6]
} }
if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) { if (!(option_mask32 & WGET_OPT_NO_CHECK_CERT)) {
argv[7] = (char*)"-verify_return_error"; /* Abort on bad server certificate */
*argp++ = (char*)"-verify"; //[7]
*argp++ = (char*)"100"; //[8]
*argp++ = (char*)"-verify_return_error"; //[9]
if (!is_ip_address(servername)) {
*argp++ = (char*)"-verify_hostname"; //[10]
*argp++ = (char*)servername; //[11]
} else {
*argp++ = (char*)"-verify_ip"; //[10]
*argp++ = (char*)host; //[11]
}
} }
//[12] (or earlier) is NULL terminator
BB_EXECVP(argv[0], argv); BB_EXECVP(argv[0], argv);
xmove_fd(3, 2); xmove_fd(3, 2);