===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nc/netcat.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -c -r1.218 -r1.219
*** src/usr.bin/nc/netcat.c	2021/07/12 15:09:20	1.218
--- src/usr.bin/nc/netcat.c	2022/06/08 20:07:31	1.219
***************
*** 1,4 ****
! /* $OpenBSD: netcat.c,v 1.218 2021/07/12 15:09:20 beck Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
--- 1,4 ----
! /* $OpenBSD: netcat.c,v 1.219 2022/06/08 20:07:31 tb Exp $ */
  /*
   * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
   * Copyright (c) 2015 Bob Beck.  All rights reserved.
***************
*** 668,674 ****
  		if (uflag)
  			unlink(unix_dg_tmp_socket);
  		return ret;
- 
  	} else {
  		int i = 0;
  
--- 668,673 ----
***************
*** 725,732 ****
  				 * if we aren't connecting thru a proxy and
  				 * there is something to report, print IP
  				 */
! 				if (!nflag && !xflag
! 				    && (strcmp(host, ipaddr) != 0))
  					fprintf(stderr, " (%s)", ipaddr);
  
  				fprintf(stderr, " %s port [%s/%s] succeeded!\n",
--- 724,731 ----
  				 * if we aren't connecting thru a proxy and
  				 * there is something to report, print IP
  				 */
! 				if (!nflag && !xflag &&
! 				    strcmp(host, ipaddr) != 0)
  					fprintf(stderr, " (%s)", ipaddr);
  
  				fprintf(stderr, " %s port [%s/%s] succeeded!\n",
***************
*** 824,830 ****
  	const char *errstr;
  
  	if (tls_connect_socket(tls_ctx, s,
! 		tls_expectname ? tls_expectname : host) == -1) {
  		errx(1, "tls connection failed (%s)",
  		    tls_error(tls_ctx));
  	}
--- 823,829 ----
  	const char *errstr;
  
  	if (tls_connect_socket(tls_ctx, s,
! 	    tls_expectname ? tls_expectname : host) == -1) {
  		errx(1, "tls connection failed (%s)",
  		    tls_error(tls_ctx));
  	}
***************
*** 913,919 ****
  		return -1;
  	}
  	return s;
- 
  }
  
  /*
--- 912,917 ----
***************
*** 1449,1455 ****
  	}
  }
  
- 
  int
  strtoport(char *portstr, int udp)
  {
--- 1447,1452 ----
***************
*** 1550,1561 ****
  
  	if (Sflag) {
  		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
! 			&x, sizeof(x)) == -1)
  			err(1, NULL);
  	}
  	if (Dflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
! 			&x, sizeof(x)) == -1)
  			err(1, NULL);
  	}
  	if (Tflag != -1) {
--- 1547,1558 ----
  
  	if (Sflag) {
  		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
! 		    &x, sizeof(x)) == -1)
  			err(1, NULL);
  	}
  	if (Dflag) {
  		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
! 		    &x, sizeof(x)) == -1)
  			err(1, NULL);
  	}
  	if (Tflag != -1) {
***************
*** 1704,1710 ****
  }
  
  void
! report_tls(struct tls * tls_ctx, char * host)
  {
  	time_t t;
  	const char *ocsp_url;
--- 1701,1707 ----
  }
  
  void
! report_tls(struct tls *tls_ctx, char *host)
  {
  	time_t t;
  	const char *ocsp_url;
***************
*** 1732,1738 ****
  	switch (tls_peer_ocsp_response_status(tls_ctx)) {
  	case TLS_OCSP_RESPONSE_SUCCESSFUL:
  		fprintf(stderr, "OCSP Stapling: %s\n",
! 		    tls_peer_ocsp_result(tls_ctx) == NULL ?  "" :
  		    tls_peer_ocsp_result(tls_ctx));
  		fprintf(stderr,
  		    "  response_status=%d cert_status=%d crl_reason=%d\n",
--- 1729,1735 ----
  	switch (tls_peer_ocsp_response_status(tls_ctx)) {
  	case TLS_OCSP_RESPONSE_SUCCESSFUL:
  		fprintf(stderr, "OCSP Stapling: %s\n",
! 		    tls_peer_ocsp_result(tls_ctx) == NULL ? "" :
  		    tls_peer_ocsp_result(tls_ctx));
  		fprintf(stderr,
  		    "  response_status=%d cert_status=%d crl_reason=%d\n",
***************
*** 1742,1763 ****
  		t = tls_peer_ocsp_this_update(tls_ctx);
  		fprintf(stderr, "  this update: %s",
  		    t != -1 ? ctime(&t) : "\n");
! 		t =  tls_peer_ocsp_next_update(tls_ctx);
  		fprintf(stderr, "  next update: %s",
  		    t != -1 ? ctime(&t) : "\n");
! 		t =  tls_peer_ocsp_revocation_time(tls_ctx);
  		fprintf(stderr, "  revocation: %s",
  		    t != -1 ? ctime(&t) : "\n");
  		break;
  	case -1:
  		break;
  	default:
! 		fprintf(stderr, "OCSP Stapling:  failure - response_status %d (%s)\n",
  		    tls_peer_ocsp_response_status(tls_ctx),
! 		    tls_peer_ocsp_result(tls_ctx) == NULL ?  "" :
  		    tls_peer_ocsp_result(tls_ctx));
  		break;
- 
  	}
  }
  
--- 1739,1760 ----
  		t = tls_peer_ocsp_this_update(tls_ctx);
  		fprintf(stderr, "  this update: %s",
  		    t != -1 ? ctime(&t) : "\n");
! 		t = tls_peer_ocsp_next_update(tls_ctx);
  		fprintf(stderr, "  next update: %s",
  		    t != -1 ? ctime(&t) : "\n");
! 		t = tls_peer_ocsp_revocation_time(tls_ctx);
  		fprintf(stderr, "  revocation: %s",
  		    t != -1 ? ctime(&t) : "\n");
  		break;
  	case -1:
  		break;
  	default:
! 		fprintf(stderr,
! 		    "OCSP Stapling:  failure - response_status %d (%s)\n",
  		    tls_peer_ocsp_response_status(tls_ctx),
! 		    tls_peer_ocsp_result(tls_ctx) == NULL ? "" :
  		    tls_peer_ocsp_result(tls_ctx));
  		break;
  	}
  }
  
***************
*** 1780,1791 ****
  	herr = getnameinfo(sa, salen, host, sizeof(host), port, sizeof(port),
  	    flags);
  	switch (herr) {
! 		case 0:
! 			break;
! 		case EAI_SYSTEM:
! 			err(1, "getnameinfo");
! 		default:
! 			errx(1, "getnameinfo: %s", gai_strerror(herr));
  	}
  
  	fprintf(stderr, "%s on %s %s\n", msg, host, port);
--- 1777,1788 ----
  	herr = getnameinfo(sa, salen, host, sizeof(host), port, sizeof(port),
  	    flags);
  	switch (herr) {
! 	case 0:
! 		break;
! 	case EAI_SYSTEM:
! 		err(1, "getnameinfo");
! 	default:
! 		errx(1, "getnameinfo: %s", gai_strerror(herr));
  	}
  
  	fprintf(stderr, "%s on %s %s\n", msg, host, port);