Re: pkg/52298: pkgtools/pkg_install fails to build with OpenSSL 1.1.0 due to incomplete type in check_ca()

[coypu%sdf.org@localhost]

The following reply was made to PR pkg/52298; it has been noted by GNATS.

From: coypu%sdf.org@localhost
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/52298: pkgtools/pkg_install fails to build with OpenSSL
 1.1.0 due to incomplete type in check_ca()
Date: Sun, 25 Jun 2017 03:54:01 +0000

 --82I3+IH0IqGh5yIs
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi, candidate patch
 
 --82I3+IH0IqGh5yIs
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="pkcs7.diff"
 
 Index: lib/pkcs7.c
 ===================================================================
 RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/pkcs7.c,v
 retrieving revision 1.5
 diff -u -r1.5 pkcs7.c
 --- lib/pkcs7.c	2 Aug 2009 17:56:45 -0000	1.5
 +++ lib/pkcs7.c	25 Jun 2017 03:52:28 -0000
 @@ -57,6 +57,7 @@
  
  static const unsigned int pkg_key_usage = XKU_CODE_SIGN | XKU_SMIME;
  
 +#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x100020bfL)
  static int
  check_ca(X509 *cert)
  {
 @@ -74,6 +75,13 @@
  		return 1;
  	return 0;
  }
 +#else
 +static int
 +check_ca(X509 *cert)
 +{
 +	return X509_check_ca(cert);
 +}
 +#endif
  
  static STACK_OF(X509) *
  file_to_certs(const char *file)
 
 --82I3+IH0IqGh5yIs--