===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/cms.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/openssl/cms.c	2019/11/04 15:33:48	1.12
--- src/usr.bin/openssl/cms.c	2019/11/04 15:34:27	1.13
***************
*** 1,4 ****
! /* $OpenBSD: cms.c,v 1.12 2019/11/04 15:33:48 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
--- 1,4 ----
! /* $OpenBSD: cms.c,v 1.13 2019/11/04 15:34:27 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project.
   */
***************
*** 483,489 ****
  		badarg = 1;
  
  	if (badarg) {
! argerr:
  		BIO_printf(bio_err, "Usage cms [options] cert.pem ...\n");
  		BIO_printf(bio_err, "where options are\n");
  		BIO_printf(bio_err, "-encrypt       encrypt message\n");
--- 483,489 ----
  		badarg = 1;
  
  	if (badarg) {
!  argerr:
  		BIO_printf(bio_err, "Usage cms [options] cert.pem ...\n");
  		BIO_printf(bio_err, "where options are\n");
  		BIO_printf(bio_err, "-encrypt       encrypt message\n");
***************
*** 936,942 ****
  	}
  	ret = 0;
  
! end:
  	if (ret)
  		ERR_print_errors(bio_err);
  
--- 936,942 ----
  	}
  	ret = 0;
  
!  end:
  	if (ret)
  		ERR_print_errors(bio_err);
  
***************
*** 1100,1106 ****
  
  	return ret;
  
! err:
  	sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
  	GENERAL_NAMES_free(gens);
  	GENERAL_NAME_free(gen);
--- 1100,1106 ----
  
  	return ret;
  
!  err:
  	sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
  	GENERAL_NAMES_free(gens);
  	GENERAL_NAME_free(gen);
***************
*** 1129,1135 ****
  	    rct_to);
  	return rr;
  
! err:
  	return NULL;
  }
  
--- 1129,1135 ----
  	    rct_to);
  	return rr;
  
!  err:
  	return NULL;
  }