summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsg <>2023-06-11 13:02:10 +0000
committerjsg <>2023-06-11 13:02:10 +0000
commite823b1655147ecdfc3662b823286cabd808805e0 (patch)
treecd8f397040872ad8925fcbfffcc4859586b32ddc /src
parent95b8b423d8bdbc3fa364e80ea0fa4bac2e4d750a (diff)
downloadopenbsd-e823b1655147ecdfc3662b823286cabd808805e0.tar.gz
openbsd-e823b1655147ecdfc3662b823286cabd808805e0.tar.bz2
openbsd-e823b1655147ecdfc3662b823286cabd808805e0.zip
remove unused args_st struct
ok tb@
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/apps.h7
-rw-r--r--src/usr.bin/openssl/openssl.c7
2 files changed, 2 insertions, 12 deletions
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index addc6b031f..8556dc14bb 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: apps.h,v 1.33 2023/06/11 12:35:00 jsg Exp $ */ 1/* $OpenBSD: apps.h,v 1.34 2023/06/11 13:02:10 jsg Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -133,11 +133,6 @@ extern CONF *config;
133extern char *default_config_file; 133extern char *default_config_file;
134extern BIO *bio_err; 134extern BIO *bio_err;
135 135
136typedef struct args_st {
137 char **data;
138 int count;
139} ARGS;
140
141#define PW_MIN_LENGTH 4 136#define PW_MIN_LENGTH 4
142typedef struct pw_cb_data { 137typedef struct pw_cb_data {
143 const void *password; 138 const void *password;
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 9e2ba54755..e5ff31a2c5 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.34 2023/06/11 05:45:20 tb Exp $ */ 1/* $OpenBSD: openssl.c,v 1.35 2023/06/11 13:02:10 jsg Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -378,16 +378,12 @@ openssl_shutdown(void)
378int 378int
379main(int argc, char **argv) 379main(int argc, char **argv)
380{ 380{
381 ARGS arg;
382 char *to_free = NULL; 381 char *to_free = NULL;
383 int i, ret = 0; 382 int i, ret = 0;
384 char *p; 383 char *p;
385 LHASH_OF(FUNCTION) * prog = NULL; 384 LHASH_OF(FUNCTION) * prog = NULL;
386 long errline; 385 long errline;
387 386
388 arg.data = NULL;
389 arg.count = 0;
390
391 if (pledge("stdio cpath wpath rpath inet dns proc flock tty", NULL) == -1) { 387 if (pledge("stdio cpath wpath rpath inet dns proc flock tty", NULL) == -1) {
392 fprintf(stderr, "openssl: pledge: %s\n", strerror(errno)); 388 fprintf(stderr, "openssl: pledge: %s\n", strerror(errno));
393 exit(1); 389 exit(1);
@@ -467,7 +463,6 @@ main(int argc, char **argv)
467 } 463 }
468 if (prog != NULL) 464 if (prog != NULL)
469 lh_FUNCTION_free(prog); 465 lh_FUNCTION_free(prog);
470 free(arg.data);
471 466
472 openssl_shutdown(); 467 openssl_shutdown();
473 468