===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_client.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/openssl/s_client.c	2020/04/26 01:59:27	1.44
--- src/usr.bin/openssl/s_client.c	2020/05/22 16:11:23	1.45
***************
*** 1,4 ****
! /* $OpenBSD: s_client.c,v 1.44 2020/04/26 01:59:27 inoguchi Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: s_client.c,v 1.45 2020/05/22 16:11:23 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 331,337 ****
  	const char *groups_in = NULL;
  	char *sess_in = NULL;
  	char *sess_out = NULL;
! 	struct sockaddr peer;
  	int peerlen = sizeof(peer);
  	int enable_timeouts = 0;
  	long socket_mtu = 0;
--- 331,337 ----
  	const char *groups_in = NULL;
  	char *sess_in = NULL;
  	char *sess_out = NULL;
! 	struct sockaddr_storage peer;
  	int peerlen = sizeof(peer);
  	int enable_timeouts = 0;
  	long socket_mtu = 0;
***************
*** 776,782 ****
  	if (SSL_version(con) == DTLS1_VERSION) {
  
  		sbio = BIO_new_dgram(s, BIO_NOCLOSE);
! 		if (getsockname(s, &peer, (void *) &peerlen) == -1) {
  			BIO_printf(bio_err, "getsockname:errno=%d\n",
  			    errno);
  			shutdown(s, SHUT_RD);
--- 776,783 ----
  	if (SSL_version(con) == DTLS1_VERSION) {
  
  		sbio = BIO_new_dgram(s, BIO_NOCLOSE);
! 		if (getsockname(s, (struct sockaddr *)&peer,
! 		    (void *)&peerlen) == -1) {
  			BIO_printf(bio_err, "getsockname:errno=%d\n",
  			    errno);
  			shutdown(s, SHUT_RD);