===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/apps.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -c -r1.45 -r1.46
*** src/usr.bin/openssl/apps.c	2018/02/07 04:25:19	1.45
--- src/usr.bin/openssl/apps.c	2018/02/07 05:47:55	1.46
***************
*** 1,4 ****
! /* $OpenBSD: apps.c,v 1.45 2018/02/07 04:25:19 jsing Exp $ */
  /*
   * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
   *
--- 1,4 ----
! /* $OpenBSD: apps.c,v 1.46 2018/02/07 05:47:55 jsing Exp $ */
  /*
   * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
   *
***************
*** 583,589 ****
  	}
  	ret = PKCS12_parse(p12, pass, pkey, cert, ca);
  
! die:
  	PKCS12_free(p12);
  	return ret;
  }
--- 583,589 ----
  	}
  	ret = PKCS12_parse(p12, pass, pkey, cert, ca);
  
!  die:
  	PKCS12_free(p12);
  	return ret;
  }
***************
*** 642,648 ****
  		goto end;
  	}
  
! end:
  	if (x == NULL) {
  		BIO_printf(err, "unable to load certificate\n");
  		ERR_print_errors(err);
--- 642,648 ----
  		goto end;
  	}
  
!  end:
  	if (x == NULL) {
  		BIO_printf(err, "unable to load certificate\n");
  		ERR_print_errors(err);
***************
*** 705,711 ****
  		BIO_printf(err, "bad input format specified for key file\n");
  		goto end;
  	}
! end:
  	BIO_free(key);
  	if (pkey == NULL) {
  		BIO_printf(err, "unable to load %s\n", key_descrip);
--- 705,711 ----
  		BIO_printf(err, "bad input format specified for key file\n");
  		goto end;
  	}
!  end:
  	BIO_free(key);
  	if (pkey == NULL) {
  		BIO_printf(err, "unable to load %s\n", key_descrip);
***************
*** 782,788 ****
  		goto end;
  	}
  
! end:
  	BIO_free(key);
  	if (pkey == NULL)
  		BIO_printf(err, "unable to load %s\n", key_descrip);
--- 782,788 ----
  		goto end;
  	}
  
!  end:
  	BIO_free(key);
  	if (pkey == NULL)
  		BIO_printf(err, "unable to load %s\n", key_descrip);
***************
*** 827,833 ****
  	EVP_PKEY_set1_RSA(pkey, rsa);
  	return pkey;
  
! error:
  	BUF_MEM_free(buf);
  	EVP_PKEY_free(pkey);
  	return NULL;
--- 827,833 ----
  	EVP_PKEY_set1_RSA(pkey, rsa);
  	return pkey;
  
!  error:
  	BUF_MEM_free(buf);
  	EVP_PKEY_free(pkey);
  	return NULL;
***************
*** 898,904 ****
  	if (pcrls && sk_X509_CRL_num(*pcrls) > 0)
  		rv = 1;
  
! end:
  	sk_X509_INFO_pop_free(xis, X509_INFO_free);
  
  	if (rv == 0) {
--- 898,904 ----
  	if (pcrls && sk_X509_CRL_num(*pcrls) > 0)
  		rv = 1;
  
!  end:
  	sk_X509_INFO_pop_free(xis, X509_INFO_free);
  
  	if (rv == 0) {
***************
*** 1064,1070 ****
  
  	ret = 1;
  
! end:
  	sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
  
  	return ret;
--- 1064,1070 ----
  
  	ret = 1;
  
!  end:
  	sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
  
  	return ret;
***************
*** 1179,1185 ****
  	ERR_clear_error();
  	return store;
  
! end:
  	X509_STORE_free(store);
  	return NULL;
  }
--- 1179,1185 ----
  	ERR_clear_error();
  	return store;
  
!  end:
  	X509_STORE_free(store);
  	return NULL;
  }
***************
*** 1308,1314 ****
  		ai = NULL;
  	}
  
! err:
  	BIO_free(in);
  	ASN1_INTEGER_free(ai);
  	return (ret);
--- 1308,1314 ----
  		ai = NULL;
  	}
  
!  err:
  	BIO_free(in);
  	ASN1_INTEGER_free(ai);
  	return (ret);
***************
*** 1354,1360 ****
  		ai = NULL;
  	}
  
! err:
  	BIO_free_all(out);
  	ASN1_INTEGER_free(ai);
  	return (ret);
--- 1354,1360 ----
  		ai = NULL;
  	}
  
!  err:
  	BIO_free_all(out);
  	ASN1_INTEGER_free(ai);
  	return (ret);
***************
*** 1399,1405 ****
  	}
  	return 1;
  
! err:
  	return 0;
  }
  
--- 1399,1405 ----
  	}
  	return 1;
  
!  err:
  	return 0;
  }
  
***************
*** 1424,1430 ****
  
  	ret = 1;
  
! error:
  	BN_free(btmp);
  
  	return ret;
--- 1424,1430 ----
  
  	ret = 1;
  
!  error:
  	BN_free(btmp);
  
  	return ret;
***************
*** 1489,1495 ****
  		}
  	}
  
! err:
  	NCONF_free(dbattr_conf);
  	TXT_DB_free(tmpdb);
  	BIO_free_all(in);
--- 1489,1495 ----
  		}
  	}
  
!  err:
  	NCONF_free(dbattr_conf);
  	TXT_DB_free(tmpdb);
  	BIO_free_all(in);
***************
*** 1562,1568 ****
  
  	return 1;
  
! err:
  	return 0;
  }
  
--- 1562,1568 ----
  
  	return 1;
  
!  err:
  	return 0;
  }
  
***************
*** 1657,1663 ****
  	}
  	return 1;
  
! err:
  	return 0;
  }
  
--- 1657,1663 ----
  	}
  	return 1;
  
!  err:
  	return 0;
  }
  
***************
*** 1820,1830 ****
  	}
  	goto done;
  
! error:
  	X509_NAME_free(name);
  	name = NULL;
  
! done:
  	free(ne_values);
  	free(ne_types);
  	free(mval);
--- 1820,1830 ----
  	}
  	goto done;
  
!  error:
  	X509_NAME_free(name);
  	name = NULL;
  
!  done:
  	free(ne_values);
  	free(ne_types);
  	free(mval);
***************
*** 1958,1964 ****
  	if (at_time)
  		X509_VERIFY_PARAM_set_time(*pm, at_time);
  
! end:
  	(*pargs)++;
  
  	if (pargc)
--- 1958,1964 ----
  	if (at_time)
  		X509_VERIFY_PARAM_set_time(*pm, at_time);
  
!  end:
  	(*pargs)++;
  
  	if (pargc)
***************
*** 2304,2320 ****
  		}
  	}
  
! done:
  	if (argsused != NULL)
  		*argsused = i;
  
  	return (0);
  
! toomany:
  	fprintf(stderr, "too many arguments\n");
  	return (1);
  
! unknown:
  	fprintf(stderr, "unknown option '%s'\n", arg);
  	return (1);
  }
--- 2304,2320 ----
  		}
  	}
  
!  done:
  	if (argsused != NULL)
  		*argsused = i;
  
  	return (0);
  
!  toomany:
  	fprintf(stderr, "too many arguments\n");
  	return (1);
  
!  unknown:
  	fprintf(stderr, "unknown option '%s'\n", arg);
  	return (1);
  }