===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/pkcs12.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -r1.26 -r1.27
*** src/usr.bin/openssl/pkcs12.c	2023/11/19 09:29:11	1.26
--- src/usr.bin/openssl/pkcs12.c	2024/02/28 17:04:38	1.27
***************
*** 1,4 ****
! /* $OpenBSD: pkcs12.c,v 1.26 2023/11/19 09:29:11 tb Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
--- 1,4 ----
! /* $OpenBSD: pkcs12.c,v 1.27 2024/02/28 17:04:38 tb Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
***************
*** 70,75 ****
--- 70,76 ----
  #include <openssl/err.h>
  #include <openssl/pem.h>
  #include <openssl/pkcs12.h>
+ #include <openssl/x509.h>
  
  #define NOKEYS		0x1
  #define NOCERTS 	0x2
***************
*** 1023,1029 ****
  	BIO_printf(bio_err, "%s, Iteration %ld\n",
  	    OBJ_nid2ln(OBJ_obj2nid(aobj)),
  	    ASN1_INTEGER_get(pbe->iter));
! 	PBEPARAM_free(pbe);
  	return 1;
  }
  
--- 1024,1030 ----
  	BIO_printf(bio_err, "%s, Iteration %ld\n",
  	    OBJ_nid2ln(OBJ_obj2nid(aobj)),
  	    ASN1_INTEGER_get(pbe->iter));
! 	ASN1_item_free((ASN1_VALUE *)pbe, &PBEPARAM_it);
  	return 1;
  }