===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ec.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- src/usr.bin/openssl/ec.c	2022/11/11 17:07:38	1.15
+++ src/usr.bin/openssl/ec.c	2023/03/06 14:32:06	1.16
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.c,v 1.15 2022/11/11 17:07:38 joshua Exp $ */
+/* $OpenBSD: ec.c,v 1.16 2023/03/06 14:32:06 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -88,7 +88,7 @@
 	int pubin;
 	int pubout;
 	int text;
-} ec_config;
+} cfg;
 
 static int
 ec_opt_enc(int argc, char **argv, int *argsused)
@@ -98,7 +98,7 @@
 	if (*name++ != '-')
 		return (1);
 
-	if ((ec_config.enc = EVP_get_cipherbyname(name)) != NULL) {
+	if ((cfg.enc = EVP_get_cipherbyname(name)) != NULL) {
 		*argsused = 1;
 		return (0);
 	}
@@ -110,17 +110,17 @@
 ec_opt_form(char *arg)
 {
 	if (strcmp(arg, "compressed") == 0)
-		ec_config.form = POINT_CONVERSION_COMPRESSED;
+		cfg.form = POINT_CONVERSION_COMPRESSED;
 	else if (strcmp(arg, "uncompressed") == 0)
-		ec_config.form = POINT_CONVERSION_UNCOMPRESSED;
+		cfg.form = POINT_CONVERSION_UNCOMPRESSED;
 	else if (strcmp(arg, "hybrid") == 0)
-		ec_config.form = POINT_CONVERSION_HYBRID;
+		cfg.form = POINT_CONVERSION_HYBRID;
 	else {
 		fprintf(stderr, "Invalid point conversion: %s\n", arg);
 		return (1);
 	}
 
-	ec_config.new_form = 1;
+	cfg.new_form = 1;
 	return (0);
 }
 
@@ -128,15 +128,15 @@
 ec_opt_named(char *arg)
 {
 	if (strcmp(arg, "named_curve") == 0)
-		ec_config.asn1_flag = OPENSSL_EC_NAMED_CURVE;
+		cfg.asn1_flag = OPENSSL_EC_NAMED_CURVE;
 	else if (strcmp(arg, "explicit") == 0)
-		ec_config.asn1_flag = 0;
+		cfg.asn1_flag = 0;
 	else {
 		fprintf(stderr, "Invalid curve type: %s\n", arg);
 		return (1);
 	}
 
-	ec_config.new_asn1_flag = 1;
+	cfg.new_asn1_flag = 1;
 	return (0);
 }
 
@@ -154,34 +154,34 @@
 		.argname = "file",
 		.desc = "Input file (default stdin)",
 		.type = OPTION_ARG,
-		.opt.arg = &ec_config.infile,
+		.opt.arg = &cfg.infile,
 	},
 	{
 		.name = "inform",
 		.argname = "format",
 		.desc = "Input format (DER or PEM (default))",
 		.type = OPTION_ARG_FORMAT,
-		.opt.value = &ec_config.informat,
+		.opt.value = &cfg.informat,
 	},
 	{
 		.name = "noout",
 		.desc = "No output",
 		.type = OPTION_FLAG,
-		.opt.flag = &ec_config.noout,
+		.opt.flag = &cfg.noout,
 	},
 	{
 		.name = "out",
 		.argname = "file",
 		.desc = "Output file (default stdout)",
 		.type = OPTION_ARG,
-		.opt.arg = &ec_config.outfile,
+		.opt.arg = &cfg.outfile,
 	},
 	{
 		.name = "outform",
 		.argname = "format",
 		.desc = "Output format (DER or PEM (default))",
 		.type = OPTION_ARG_FORMAT,
-		.opt.value = &ec_config.outformat,
+		.opt.value = &cfg.outformat,
 	},
 	{
 		.name = "param_enc",
@@ -195,39 +195,39 @@
 		.name = "param_out",
 		.desc = "Print the elliptic curve parameters",
 		.type = OPTION_FLAG,
-		.opt.flag = &ec_config.param_out,
+		.opt.flag = &cfg.param_out,
 	},
 	{
 		.name = "passin",
 		.argname = "source",
 		.desc = "Input file passphrase source",
 		.type = OPTION_ARG,
-		.opt.arg = &ec_config.passargin,
+		.opt.arg = &cfg.passargin,
 	},
 	{
 		.name = "passout",
 		.argname = "source",
 		.desc = "Output file passphrase source",
 		.type = OPTION_ARG,
-		.opt.arg = &ec_config.passargout,
+		.opt.arg = &cfg.passargout,
 	},
 	{
 		.name = "pubin",
 		.desc = "Read public key instead of private key from input",
 		.type = OPTION_FLAG,
-		.opt.flag = &ec_config.pubin,
+		.opt.flag = &cfg.pubin,
 	},
 	{
 		.name = "pubout",
 		.desc = "Output public key instead of private key in output",
 		.type = OPTION_FLAG,
-		.opt.flag = &ec_config.pubout,
+		.opt.flag = &cfg.pubout,
 	},
 	{
 		.name = "text",
 		.desc = "Print the public/private key components and parameters",
 		.type = OPTION_FLAG,
-		.opt.flag = &ec_config.text,
+		.opt.flag = &cfg.text,
 	},
 	{
 		.name = NULL,
@@ -272,19 +272,19 @@
 		exit(1);
 	}
 
-	memset(&ec_config, 0, sizeof(ec_config));
+	memset(&cfg, 0, sizeof(cfg));
 
-	ec_config.asn1_flag = OPENSSL_EC_NAMED_CURVE;
-	ec_config.form = POINT_CONVERSION_UNCOMPRESSED;
-	ec_config.informat = FORMAT_PEM;
-	ec_config.outformat = FORMAT_PEM;
+	cfg.asn1_flag = OPENSSL_EC_NAMED_CURVE;
+	cfg.form = POINT_CONVERSION_UNCOMPRESSED;
+	cfg.informat = FORMAT_PEM;
+	cfg.outformat = FORMAT_PEM;
 
 	if (options_parse(argc, argv, ec_options, NULL, NULL) != 0) {
 		ec_usage();
 		goto end;
 	}
 
-	if (!app_passwd(bio_err, ec_config.passargin, ec_config.passargout,
+	if (!app_passwd(bio_err, cfg.passargin, cfg.passargout,
 	    &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
 		goto end;
@@ -295,23 +295,23 @@
 		ERR_print_errors(bio_err);
 		goto end;
 	}
-	if (ec_config.infile == NULL)
+	if (cfg.infile == NULL)
 		BIO_set_fp(in, stdin, BIO_NOCLOSE);
 	else {
-		if (BIO_read_filename(in, ec_config.infile) <= 0) {
-			perror(ec_config.infile);
+		if (BIO_read_filename(in, cfg.infile) <= 0) {
+			perror(cfg.infile);
 			goto end;
 		}
 	}
 
 	BIO_printf(bio_err, "read EC key\n");
-	if (ec_config.informat == FORMAT_ASN1) {
-		if (ec_config.pubin)
+	if (cfg.informat == FORMAT_ASN1) {
+		if (cfg.pubin)
 			eckey = d2i_EC_PUBKEY_bio(in, NULL);
 		else
 			eckey = d2i_ECPrivateKey_bio(in, NULL);
-	} else if (ec_config.informat == FORMAT_PEM) {
-		if (ec_config.pubin)
+	} else if (cfg.informat == FORMAT_PEM) {
+		if (cfg.pubin)
 			eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL,
 			    NULL);
 		else
@@ -326,49 +326,49 @@
 		ERR_print_errors(bio_err);
 		goto end;
 	}
-	if (ec_config.outfile == NULL) {
+	if (cfg.outfile == NULL) {
 		BIO_set_fp(out, stdout, BIO_NOCLOSE);
 	} else {
-		if (BIO_write_filename(out, ec_config.outfile) <= 0) {
-			perror(ec_config.outfile);
+		if (BIO_write_filename(out, cfg.outfile) <= 0) {
+			perror(cfg.outfile);
 			goto end;
 		}
 	}
 
 	group = EC_KEY_get0_group(eckey);
 
-	if (ec_config.new_form)
-		EC_KEY_set_conv_form(eckey, ec_config.form);
+	if (cfg.new_form)
+		EC_KEY_set_conv_form(eckey, cfg.form);
 
-	if (ec_config.new_asn1_flag)
-		EC_KEY_set_asn1_flag(eckey, ec_config.asn1_flag);
+	if (cfg.new_asn1_flag)
+		EC_KEY_set_asn1_flag(eckey, cfg.asn1_flag);
 
-	if (ec_config.text)
+	if (cfg.text)
 		if (!EC_KEY_print(out, eckey, 0)) {
-			perror(ec_config.outfile);
+			perror(cfg.outfile);
 			ERR_print_errors(bio_err);
 			goto end;
 		}
-	if (ec_config.noout) {
+	if (cfg.noout) {
 		ret = 0;
 		goto end;
 	}
 	BIO_printf(bio_err, "writing EC key\n");
-	if (ec_config.outformat == FORMAT_ASN1) {
-		if (ec_config.param_out)
+	if (cfg.outformat == FORMAT_ASN1) {
+		if (cfg.param_out)
 			i = i2d_ECPKParameters_bio(out, group);
-		else if (ec_config.pubin || ec_config.pubout)
+		else if (cfg.pubin || cfg.pubout)
 			i = i2d_EC_PUBKEY_bio(out, eckey);
 		else
 			i = i2d_ECPrivateKey_bio(out, eckey);
-	} else if (ec_config.outformat == FORMAT_PEM) {
-		if (ec_config.param_out)
+	} else if (cfg.outformat == FORMAT_PEM) {
+		if (cfg.param_out)
 			i = PEM_write_bio_ECPKParameters(out, group);
-		else if (ec_config.pubin || ec_config.pubout)
+		else if (cfg.pubin || cfg.pubout)
 			i = PEM_write_bio_EC_PUBKEY(out, eckey);
 		else
 			i = PEM_write_bio_ECPrivateKey(out, eckey,
-			    ec_config.enc, NULL, 0, NULL, passout);
+			    cfg.enc, NULL, 0, NULL, passout);
 	} else {
 		BIO_printf(bio_err, "bad output format specified for "
 		    "outfile\n");