===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/pkcs7.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/openssl/pkcs7.c	2014/08/28 14:23:52	1.2
--- src/usr.bin/openssl/pkcs7.c	2015/07/20 16:48:11	1.3
***************
*** 1,4 ****
! /* $OpenBSD: pkcs7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: pkcs7.c,v 1.3 2015/07/20 16:48:11 doug Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 173,183 ****
  	if (infile == NULL)
  		BIO_set_fp(in, stdin, BIO_NOCLOSE);
  	else {
! 		if (BIO_read_filename(in, infile) <= 0)
! 			if (in == NULL) {
! 				perror(infile);
! 				goto end;
! 			}
  	}
  
  	if (informat == FORMAT_ASN1)
--- 173,182 ----
  	if (infile == NULL)
  		BIO_set_fp(in, stdin, BIO_NOCLOSE);
  	else {
! 		if (BIO_read_filename(in, infile) <= 0) {
! 			perror(infile);
! 			goto end;
! 		}
  	}
  
  	if (informat == FORMAT_ASN1)