===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/dgst.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/openssl/dgst.c	2019/08/30 12:09:05	1.17
--- src/usr.bin/openssl/dgst.c	2019/08/30 12:32:14	1.18
***************
*** 1,4 ****
! /* $OpenBSD: dgst.c,v 1.17 2019/08/30 12:09:05 inoguchi Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: dgst.c,v 1.18 2019/08/30 12:32:14 inoguchi Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 462,469 ****
  		}
  		r = 1;
   mac_end:
! 		if (mac_ctx)
! 			EVP_PKEY_CTX_free(mac_ctx);
  		if (r == 0)
  			goto end;
  	}
--- 462,468 ----
  		}
  		r = 1;
   mac_end:
! 		EVP_PKEY_CTX_free(mac_ctx);
  		if (r == 0)
  			goto end;
  	}
***************
*** 589,606 ****
  
   end:
  	freezero(buf, BUFSIZE);
! 	if (in != NULL)
! 		BIO_free(in);
  	free(passin);
  	BIO_free_all(out);
  	EVP_PKEY_free(sigkey);
! 	if (dgst_config.sigopts)
! 		sk_OPENSSL_STRING_free(dgst_config.sigopts);
! 	if (dgst_config.macopts)
! 		sk_OPENSSL_STRING_free(dgst_config.macopts);
  	free(sigbuf);
! 	if (bmd != NULL)
! 		BIO_free(bmd);
  
  	return (err);
  }
--- 588,601 ----
  
   end:
  	freezero(buf, BUFSIZE);
! 	BIO_free(in);
  	free(passin);
  	BIO_free_all(out);
  	EVP_PKEY_free(sigkey);
! 	sk_OPENSSL_STRING_free(dgst_config.sigopts);
! 	sk_OPENSSL_STRING_free(dgst_config.macopts);
  	free(sigbuf);
! 	BIO_free(bmd);
  
  	return (err);
  }