===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/socks.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/nc/socks.c	2016/06/27 14:43:04	1.24
--- src/usr.bin/nc/socks.c	2018/03/27 16:31:10	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: socks.c,v 1.24 2016/06/27 14:43:04 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: socks.c,v 1.25 2018/03/27 16:31:10 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
***************
*** 109,125 ****
  	return (off);
  }
  
! static const char *
! getproxypass(const char *proxyuser, const char *proxyhost)
  {
  	char prompt[512];
- 	static char pw[256];
  
  	snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ",
  	   proxyuser, proxyhost);
! 	if (readpassphrase(prompt, pw, sizeof(pw), RPP_REQUIRE_TTY) == NULL)
  		errx(1, "Unable to read proxy passphrase");
- 	return (pw);
  }
  
  /*
--- 109,124 ----
  	return (off);
  }
  
! static void
! getproxypass(const char *proxyuser, const char *proxyhost,
!     char *pw, size_t pwlen)
  {
  	char prompt[512];
  
  	snprintf(prompt, sizeof(prompt), "Proxy password for %s@%s: ",
  	   proxyuser, proxyhost);
! 	if (readpassphrase(prompt, pw, pwlen, RPP_REQUIRE_TTY) == NULL)
  		errx(1, "Unable to read proxy passphrase");
  }
  
  /*
***************
*** 188,194 ****
  	struct sockaddr_in *in4 = (struct sockaddr_in *)&addr;
  	struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&addr;
  	in_port_t serverport;
- 	const char *proxypass = NULL;
  
  	if (proxyport == NULL)
  		proxyport = (socksv == -1) ? HTTP_PROXY_PORT : SOCKS_PORT;
--- 187,192 ----
***************
*** 345,355 ****
  			err(1, "write failed (%zu/%d)", cnt, r);
  
  		if (authretry > 1) {
  			char resp[1024];
  
! 			proxypass = getproxypass(proxyuser, proxyhost);
  			r = snprintf(buf, sizeof(buf), "%s:%s",
  			    proxyuser, proxypass);
  			if (r == -1 || (size_t)r >= sizeof(buf) ||
  			    b64_ntop(buf, strlen(buf), resp,
  			    sizeof(resp)) == -1)
--- 343,356 ----
  			err(1, "write failed (%zu/%d)", cnt, r);
  
  		if (authretry > 1) {
+ 			char proxypass[256];
  			char resp[1024];
  
! 			getproxypass(proxyuser, proxyhost,
! 			    proxypass, sizeof proxypass);
  			r = snprintf(buf, sizeof(buf), "%s:%s",
  			    proxyuser, proxypass);
+ 			explicit_bzero(proxypass, sizeof proxypass);
  			if (r == -1 || (size_t)r >= sizeof(buf) ||
  			    b64_ntop(buf, strlen(buf), resp,
  			    sizeof(resp)) == -1)
***************
*** 361,366 ****
--- 362,369 ----
  			r = strlen(buf);
  			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
  				err(1, "write failed (%zu/%d)", cnt, r);
+ 			explicit_bzero(proxypass, sizeof proxypass);
+ 			explicit_bzero(buf, sizeof buf);
  		}
  
  		/* Terminate headers */