From bfe41498f545753dac1119fd7055b642e2030ceb Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 2 Jan 2025 12:31:44 +0000
Subject: openssl(1) doesn't need 6 .h files: fold progs.h into apps.h
discussed with jsing
---
src/usr.bin/openssl/apps.h | 47 +++++++++++++++++++++++++++++++++++++++++-
src/usr.bin/openssl/asn1pars.c | 3 +--
src/usr.bin/openssl/ciphers.c | 3 +--
src/usr.bin/openssl/openssl.c | 3 +--
src/usr.bin/openssl/pkcs8.c | 3 +--
src/usr.bin/openssl/progs.h | 46 -----------------------------------------
src/usr.bin/openssl/rsa.c | 3 +--
src/usr.bin/openssl/sess_id.c | 3 +--
8 files changed, 52 insertions(+), 59 deletions(-)
delete mode 100644 src/usr.bin/openssl/progs.h
(limited to 'src')
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index a30706e364..f5f654d6d2 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.38 2024/08/29 17:01:02 tb Exp $ */
+/* $OpenBSD: apps.h,v 1.39 2025/01/02 12:31:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -315,4 +315,49 @@ int options_parse(int argc, char **argv, const struct option *opts,
char **unnamed, int *argsused);
void show_cipher(const OBJ_NAME *name, void *arg);
+
+int asn1parse_main(int argc, char **argv);
+int ca_main(int argc, char **argv);
+int certhash_main(int argc, char **argv);
+int ciphers_main(int argc, char **argv);
+int cms_main(int argc, char **argv);
+int crl2pkcs7_main(int argc, char **argv);
+int crl_main(int argc, char **argv);
+int dgst_main(int argc, char **argv);
+int dh_main(int argc, char **argv);
+int dhparam_main(int argc, char **argv);
+int dsa_main(int argc, char **argv);
+int dsaparam_main(int argc, char **argv);
+int ec_main(int argc, char **argv);
+int ecparam_main(int argc, char **argv);
+int enc_main(int argc, char **argv);
+int errstr_main(int argc, char **argv);
+int gendh_main(int argc, char **argv);
+int gendsa_main(int argc, char **argv);
+int genpkey_main(int argc, char **argv);
+int genrsa_main(int argc, char **argv);
+int ocsp_main(int argc, char **argv);
+int passwd_main(int argc, char **argv);
+int pkcs7_main(int argc, char **argv);
+int pkcs8_main(int argc, char **argv);
+int pkcs12_main(int argc, char **argv);
+int pkey_main(int argc, char **argv);
+int pkeyparam_main(int argc, char **argv);
+int pkeyutl_main(int argc, char **argv);
+int prime_main(int argc, char **argv);
+int rand_main(int argc, char **argv);
+int req_main(int argc, char **argv);
+int rsa_main(int argc, char **argv);
+int rsautl_main(int argc, char **argv);
+int s_client_main(int argc, char **argv);
+int s_server_main(int argc, char **argv);
+int s_time_main(int argc, char **argv);
+int sess_id_main(int argc, char **argv);
+int smime_main(int argc, char **argv);
+int speed_main(int argc, char **argv);
+int ts_main(int argc, char **argv);
+int verify_main(int argc, char **argv);
+int version_main(int argc, char **argv);
+int x509_main(int argc, char **argv);
+
#endif
diff --git a/src/usr.bin/openssl/asn1pars.c b/src/usr.bin/openssl/asn1pars.c
index 6b99842330..355784169e 100644
--- a/src/usr.bin/openssl/asn1pars.c
+++ b/src/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.16 2023/07/23 11:39:29 tb Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.17 2025/01/02 12:31:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -66,7 +66,6 @@
#include <string.h>
#include "apps.h"
-#include "progs.h"
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/src/usr.bin/openssl/ciphers.c b/src/usr.bin/openssl/ciphers.c
index 3478df910e..9549fa3607 100644
--- a/src/usr.bin/openssl/ciphers.c
+++ b/src/usr.bin/openssl/ciphers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciphers.c,v 1.19 2024/12/11 12:18:05 tb Exp $ */
+/* $OpenBSD: ciphers.c,v 1.20 2025/01/02 12:31:44 tb Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -22,7 +22,6 @@
#include <openssl/ssl.h>
#include "apps.h"
-#include "progs.h"
static struct {
int usage;
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index adafb0bc71..eaa5401ece 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.37 2024/07/08 05:59:10 tb Exp $ */
+/* $OpenBSD: openssl.c,v 1.38 2025/01/02 12:31:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -127,7 +127,6 @@
#include <openssl/ssl.h>
#include <openssl/x509.h>
-#include "progs.h"
#include "s_apps.h"
#define FUNC_TYPE_GENERAL 1
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index 9776b91052..10fad7aed1 100644
--- a/src/usr.bin/openssl/pkcs8.c
+++ b/src/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.17 2023/07/23 11:39:29 tb Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.18 2025/01/02 12:31:44 tb Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999-2004.
*/
@@ -60,7 +60,6 @@
#include <string.h>
#include "apps.h"
-#include "progs.h"
#include <openssl/err.h>
#include <openssl/evp.h>
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
deleted file mode 100644
index 6cbc9d7b5f..0000000000
--- a/src/usr.bin/openssl/progs.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* $OpenBSD: progs.h,v 1.11 2024/07/08 05:59:10 tb Exp $ */
-/* Public domain */
-
-int asn1parse_main(int argc, char **argv);
-int ca_main(int argc, char **argv);
-int certhash_main(int argc, char **argv);
-int ciphers_main(int argc, char **argv);
-int cms_main(int argc, char **argv);
-int crl2pkcs7_main(int argc, char **argv);
-int crl_main(int argc, char **argv);
-int dgst_main(int argc, char **argv);
-int dh_main(int argc, char **argv);
-int dhparam_main(int argc, char **argv);
-int dsa_main(int argc, char **argv);
-int dsaparam_main(int argc, char **argv);
-int ec_main(int argc, char **argv);
-int ecparam_main(int argc, char **argv);
-int enc_main(int argc, char **argv);
-int errstr_main(int argc, char **argv);
-int gendh_main(int argc, char **argv);
-int gendsa_main(int argc, char **argv);
-int genpkey_main(int argc, char **argv);
-int genrsa_main(int argc, char **argv);
-int ocsp_main(int argc, char **argv);
-int passwd_main(int argc, char **argv);
-int pkcs7_main(int argc, char **argv);
-int pkcs8_main(int argc, char **argv);
-int pkcs12_main(int argc, char **argv);
-int pkey_main(int argc, char **argv);
-int pkeyparam_main(int argc, char **argv);
-int pkeyutl_main(int argc, char **argv);
-int prime_main(int argc, char **argv);
-int rand_main(int argc, char **argv);
-int req_main(int argc, char **argv);
-int rsa_main(int argc, char **argv);
-int rsautl_main(int argc, char **argv);
-int s_client_main(int argc, char **argv);
-int s_server_main(int argc, char **argv);
-int s_time_main(int argc, char **argv);
-int sess_id_main(int argc, char **argv);
-int smime_main(int argc, char **argv);
-int speed_main(int argc, char **argv);
-int ts_main(int argc, char **argv);
-int verify_main(int argc, char **argv);
-int version_main(int argc, char **argv);
-int x509_main(int argc, char **argv);
diff --git a/src/usr.bin/openssl/rsa.c b/src/usr.bin/openssl/rsa.c
index 5492cd6162..a98ae8be90 100644
--- a/src/usr.bin/openssl/rsa.c
+++ b/src/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.19 2023/07/23 11:39:29 tb Exp $ */
+/* $OpenBSD: rsa.c,v 1.20 2025/01/02 12:31:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -64,7 +64,6 @@
#include <time.h>
#include "apps.h"
-#include "progs.h"
#include <openssl/bio.h>
#include <openssl/bn.h>
diff --git a/src/usr.bin/openssl/sess_id.c b/src/usr.bin/openssl/sess_id.c
index c46da54244..26db2fa10f 100644
--- a/src/usr.bin/openssl/sess_id.c
+++ b/src/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sess_id.c,v 1.12 2023/03/06 14:32:06 tb Exp $ */
+/* $OpenBSD: sess_id.c,v 1.13 2025/01/02 12:31:44 tb Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -61,7 +61,6 @@
#include <string.h>
#include "apps.h"
-#include "progs.h"
#include <openssl/bio.h>
#include <openssl/err.h>
--
cgit v1.2.3-55-g6feb