1 files changed, 17 insertions, 17 deletions

diff --git a/src/usr.bin/openssl/prime.c b/src/usr.bin/openssl/prime.c
index 64b1953e33..d704d882fc 100644
--- a/src/usr.bin/openssl/prime.c
+++ b/src/usr.bin/openssl/prime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prime.c,v 1.16 2023/03/05 13:12:53 tb Exp $ */
+/* $OpenBSD: prime.c,v 1.17 2023/03/06 14:32:06 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
  *
@@ -62,7 +62,7 @@ static struct {
         int generate;
         int hex;
         int safe;
-} prime_config;
+} cfg;
 
 static const struct option prime_options[] = {
         {
@@ -70,32 +70,32 @@ static const struct option prime_options[] = {
                 .argname = "n",
                 .desc = "Number of bits in the generated prime number",
                 .type = OPTION_ARG_INT,
-                .opt.value = &prime_config.bits,
+                .opt.value = &cfg.bits,
         },
         {
                 .name = "checks",
                 .argname = "n",
                 .desc = "Miller-Rabin probabilistic primality test iterations",
                 .type = OPTION_ARG_INT,
-                .opt.value = &prime_config.checks,
+                .opt.value = &cfg.checks,
         },
         {
                 .name = "generate",
                 .desc = "Generate a pseudo-random prime number",
                 .type = OPTION_FLAG,
-                .opt.flag = &prime_config.generate,
+                .opt.flag = &cfg.generate,
         },
         {
                 .name = "hex",
                 .desc = "Hexadecimal prime numbers",
                 .type = OPTION_FLAG,
-                .opt.flag = &prime_config.hex,
+                .opt.flag = &cfg.hex,
         },
         {
                 .name = "safe",
                 .desc = "Generate only \"safe\" prime numbers",
                 .type = OPTION_FLAG,
-                .opt.flag = &prime_config.safe,
+                .opt.flag = &cfg.safe,
         },
         {NULL},
 };
@@ -123,17 +123,17 @@ prime_main(int argc, char **argv)
                 exit(1);
         }
 
-        memset(&prime_config, 0, sizeof(prime_config));
+        memset(&cfg, 0, sizeof(cfg));
 
         /* Default iterations for Miller-Rabin probabilistic primality test. */
-        prime_config.checks = 20;
+        cfg.checks = 20;
 
         if (options_parse(argc, argv, prime_options, &prime, NULL) != 0) {
                 prime_usage();
                 return (1);
         }
 
-        if (prime == NULL && prime_config.generate == 0) {
+        if (prime == NULL && cfg.generate == 0) {
                 BIO_printf(bio_err, "No prime specified.\n");
                 prime_usage();
                 return (1);
@@ -145,8 +145,8 @@ prime_main(int argc, char **argv)
         }
         BIO_set_fp(bio_out, stdout, BIO_NOCLOSE);
 
-        if (prime_config.generate != 0) {
-                if (prime_config.bits == 0) {
+        if (cfg.generate != 0) {
+                if (cfg.bits == 0) {
                         BIO_printf(bio_err, "Specify the number of bits.\n");
                         goto end;
                 }
@@ -155,12 +155,12 @@ prime_main(int argc, char **argv)
                         BIO_printf(bio_err, "Out of memory.\n");
                         goto end;
                 }
-                if (!BN_generate_prime_ex(bn, prime_config.bits,
-                    prime_config.safe, NULL, NULL, NULL)) {
+                if (!BN_generate_prime_ex(bn, cfg.bits,
+                    cfg.safe, NULL, NULL, NULL)) {
                         BIO_printf(bio_err, "Prime generation error.\n");
                         goto end;
                 }
-                s = prime_config.hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
+                s = cfg.hex ? BN_bn2hex(bn) : BN_bn2dec(bn);
                 if (s == NULL) {
                         BIO_printf(bio_err, "Out of memory.\n");
                         goto end;
@@ -168,7 +168,7 @@ prime_main(int argc, char **argv)
                 BIO_printf(bio_out, "%s\n", s);
                 free(s);
         } else {
-                if (prime_config.hex) {
+                if (cfg.hex) {
                         if (!BN_hex2bn(&bn, prime)) {
                                 BIO_printf(bio_err, "%s is an invalid hex "
                                     "value.\n", prime);
@@ -182,7 +182,7 @@ prime_main(int argc, char **argv)
                         }
                 }
 
-                is_prime = BN_is_prime_ex(bn, prime_config.checks, NULL, NULL);
+                is_prime = BN_is_prime_ex(bn, cfg.checks, NULL, NULL);
                 if (is_prime < 0) {
                         BIO_printf(bio_err, "BN_is_prime_ex failed.\n");
                         goto end;