===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_client.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/openssl/s_client.c	2017/01/24 09:07:40	1.31
--- src/usr.bin/openssl/s_client.c	2017/04/18 02:15:50	1.32
***************
*** 1,4 ****
! /* $OpenBSD: s_client.c,v 1.31 2017/01/24 09:07:40 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: s_client.c,v 1.32 2017/04/18 02:15:50 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 1266,1283 ****
  	free(pass);
  	if (vpm)
  		X509_VERIFY_PARAM_free(vpm);
! 	if (cbuf != NULL) {
! 		explicit_bzero(cbuf, BUFSIZZ);
! 		free(cbuf);
! 	}
! 	if (sbuf != NULL) {
! 		explicit_bzero(sbuf, BUFSIZZ);
! 		free(sbuf);
! 	}
! 	if (mbuf != NULL) {
! 		explicit_bzero(mbuf, BUFSIZZ);
! 		free(mbuf);
! 	}
  	if (bio_c_out != NULL) {
  		BIO_free(bio_c_out);
  		bio_c_out = NULL;
--- 1266,1274 ----
  	free(pass);
  	if (vpm)
  		X509_VERIFY_PARAM_free(vpm);
! 	freezero(cbuf, BUFSIZZ);
! 	freezero(sbuf, BUFSIZZ);
! 	freezero(mbuf, BUFSIZZ);
  	if (bio_c_out != NULL) {
  		BIO_free(bio_c_out);
  		bio_c_out = NULL;