Module Name:    src
Committed By:   christos
Date:           Sun May  7 16:19:24 UTC 2023

Modified Files:
        src/crypto/external/bsd/openssl/bin: Makefile
Added Files:
        src/crypto/external/bsd/openssl/bin: progs.c progs.h

Log Message:
make this link


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/bin/progs.c \
    src/crypto/external/bsd/openssl/bin/progs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.10 src/crypto/external/bsd/openssl/bin/Makefile:1.11
--- src/crypto/external/bsd/openssl/bin/Makefile:1.10	Sun Sep 23 09:32:54 2018
+++ src/crypto/external/bsd/openssl/bin/Makefile	Sun May  7 12:19:24 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2018/09/23 13:32:54 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
 
 WARNS?=	2	# XXX -Wcast-qual
 
@@ -10,7 +10,7 @@ BINDIR=/usr/bin
 USE_FORT?= yes	# cryptographic software
 
 # RCSid:
-#	$Id: Makefile,v 1.10 2018/09/23 13:32:54 christos Exp $
+#	$Id: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -27,23 +27,72 @@ USE_FORT?= yes	# cryptographic software
 
 PROG=	openssl
 
-SRCS=	openssl.c
-SRCS+=	apps.c ecparam.c ec.c pkeyparam.c genpkey.c pkey.c pkeyutl.c ts.c cms.c
-SRCS+=	s_cb.c s_socket.c bf_prefix.c storeutl.c
-SRCS+=	app_rand.c rehash.c
-SRCS+=	verify.c asn1pars.c req.c dgst.c dhparam.c enc.c passwd.c errstr.c \
-	opt.c ca.c \
-	pkcs7.c crl2p7.c crl.c \
-	rsa.c rsautl.c dsa.c dsaparam.c \
-	x509.c genrsa.c gendsa.c prime.c s_server.c s_client.c speed.c \
-	s_time.c version.c sess_id.c srp.c \
-	ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c
+SRCS+= \
+asn1parse.c \
+ca.c \
+ciphers.c \
+cmp.c \
+cms.c \
+crl.c \
+crl2pkcs7.c \
+dgst.c \
+dhparam.c \
+dsa.c \
+dsaparam.c \
+ec.c \
+ecparam.c \
+enc.c \
+engine.c \
+errstr.c \
+fipsinstall.c \
+gendsa.c \
+genpkey.c \
+genrsa.c \
+info.c \
+kdf.c \
+list.c \
+mac.c \
+nseq.c \
+ocsp.c \
+openssl.c \
+passwd.c \
+pkcs12.c \
+pkcs7.c \
+pkcs8.c \
+pkey.c \
+pkeyparam.c \
+pkeyutl.c \
+prime.c \
+progs.c \
+rand.c \
+rehash.c \
+req.c \
+rsa.c \
+rsautl.c \
+s_client.c \
+s_server.c \
+s_time.c \
+sess_id.c \
+smime.c \
+speed.c \
+spkac.c \
+srp.c \
+storeutl.c \
+ts.c \
+verify.c \
+version.c \
+x509.c \
+
+CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} -I${.CURDIR}
+CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/apps/include
+
+PROGDPLIBSSTATIC=yes
+PROGDPLIBS+=    apps ${OPENSSLSRC}/../lib/libapps
+PROGDPLIBS+=    ssl ${OPENSSLSRC}/../lib/libssl
+PROGDPLIBS+=    crypto ${OPENSSLSRC}/../lib/libcrypto
 
-CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
-CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
-
-LDADD+=	-lssl -lcrypto -lcrypt
-DPADD+=	${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=	-lcrypt
+DPADD+=	${LIBCRYPT}
 
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"

Added files:

Index: src/crypto/external/bsd/openssl/bin/progs.c
diff -u /dev/null src/crypto/external/bsd/openssl/bin/progs.c:1.1
--- /dev/null	Sun May  7 12:19:24 2023
+++ src/crypto/external/bsd/openssl/bin/progs.c	Sun May  7 12:19:24 2023
@@ -0,0 +1,397 @@
+/*
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
+ *
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "progs.h"
+
+FUNCTION functions[] = {
+    {FT_general, "asn1parse", asn1parse_main, asn1parse_options, NULL, NULL},
+    {FT_general, "ca", ca_main, ca_options, NULL, NULL},
+#ifndef OPENSSL_NO_SOCK
+    {FT_general, "ciphers", ciphers_main, ciphers_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_CMP
+    {FT_general, "cmp", cmp_main, cmp_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_CMS
+    {FT_general, "cms", cms_main, cms_options, NULL, NULL},
+#endif
+    {FT_general, "crl", crl_main, crl_options, NULL, NULL},
+    {FT_general, "crl2pkcs7", crl2pkcs7_main, crl2pkcs7_options, NULL, NULL},
+    {FT_general, "dgst", dgst_main, dgst_options, NULL, NULL},
+#ifndef OPENSSL_NO_DH
+    {FT_general, "dhparam", dhparam_main, dhparam_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_DSA
+    {FT_general, "dsa", dsa_main, dsa_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_DSA
+    {FT_general, "dsaparam", dsaparam_main, dsaparam_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_EC
+    {FT_general, "ec", ec_main, ec_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_EC
+    {FT_general, "ecparam", ecparam_main, ecparam_options, NULL, NULL},
+#endif
+    {FT_general, "enc", enc_main, enc_options, NULL, NULL},
+#ifndef OPENSSL_NO_ENGINE
+    {FT_general, "engine", engine_main, engine_options, NULL, NULL},
+#endif
+    {FT_general, "errstr", errstr_main, errstr_options, NULL, NULL},
+    {FT_general, "fipsinstall", fipsinstall_main, fipsinstall_options, NULL, NULL},
+#ifndef OPENSSL_NO_DSA
+    {FT_general, "gendsa", gendsa_main, gendsa_options, NULL, NULL},
+#endif
+    {FT_general, "genpkey", genpkey_main, genpkey_options, NULL, NULL},
+#ifndef OPENSSL_NO_RSA
+    {FT_general, "genrsa", genrsa_main, genrsa_options, NULL, NULL},
+#endif
+    {FT_general, "help", help_main, help_options, NULL, NULL},
+    {FT_general, "info", info_main, info_options, NULL, NULL},
+    {FT_general, "kdf", kdf_main, kdf_options, NULL, NULL},
+    {FT_general, "list", list_main, list_options, NULL, NULL},
+    {FT_general, "mac", mac_main, mac_options, NULL, NULL},
+    {FT_general, "nseq", nseq_main, nseq_options, NULL, NULL},
+#ifndef OPENSSL_NO_OCSP
+    {FT_general, "ocsp", ocsp_main, ocsp_options, NULL, NULL},
+#endif
+    {FT_general, "passwd", passwd_main, passwd_options, NULL, NULL},
+    {FT_general, "pkcs12", pkcs12_main, pkcs12_options, NULL, NULL},
+    {FT_general, "pkcs7", pkcs7_main, pkcs7_options, NULL, NULL},
+    {FT_general, "pkcs8", pkcs8_main, pkcs8_options, NULL, NULL},
+    {FT_general, "pkey", pkey_main, pkey_options, NULL, NULL},
+    {FT_general, "pkeyparam", pkeyparam_main, pkeyparam_options, NULL, NULL},
+    {FT_general, "pkeyutl", pkeyutl_main, pkeyutl_options, NULL, NULL},
+    {FT_general, "prime", prime_main, prime_options, NULL, NULL},
+    {FT_general, "rand", rand_main, rand_options, NULL, NULL},
+    {FT_general, "rehash", rehash_main, rehash_options, NULL, NULL},
+    {FT_general, "req", req_main, req_options, NULL, NULL},
+    {FT_general, "rsa", rsa_main, rsa_options, NULL, NULL},
+#if !defined(OPENSSL_NO_DEPRECATED_3_0) && !defined(OPENSSL_NO_RSA)
+    {FT_general, "rsautl", rsautl_main, rsautl_options, "pkeyutl", "3.0"},
+#endif
+#ifndef OPENSSL_NO_SOCK
+    {FT_general, "s_client", s_client_main, s_client_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_SOCK
+    {FT_general, "s_server", s_server_main, s_server_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_SOCK
+    {FT_general, "s_time", s_time_main, s_time_options, NULL, NULL},
+#endif
+    {FT_general, "sess_id", sess_id_main, sess_id_options, NULL, NULL},
+    {FT_general, "smime", smime_main, smime_options, NULL, NULL},
+    {FT_general, "speed", speed_main, speed_options, NULL, NULL},
+    {FT_general, "spkac", spkac_main, spkac_options, NULL, NULL},
+#ifndef OPENSSL_NO_SRP
+    {FT_general, "srp", srp_main, srp_options, NULL, NULL},
+#endif
+    {FT_general, "storeutl", storeutl_main, storeutl_options, NULL, NULL},
+#ifndef OPENSSL_NO_TS
+    {FT_general, "ts", ts_main, ts_options, NULL, NULL},
+#endif
+    {FT_general, "verify", verify_main, verify_options, NULL, NULL},
+    {FT_general, "version", version_main, version_options, NULL, NULL},
+    {FT_general, "x509", x509_main, x509_options, NULL, NULL},
+#ifndef OPENSSL_NO_MD2
+    {FT_md, "md2", dgst_main, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_MD4
+    {FT_md, "md4", dgst_main, NULL, NULL},
+#endif
+    {FT_md, "md5", dgst_main, NULL, NULL},
+    {FT_md, "sha1", dgst_main, NULL, NULL},
+    {FT_md, "sha224", dgst_main, NULL, NULL},
+    {FT_md, "sha256", dgst_main, NULL, NULL},
+    {FT_md, "sha384", dgst_main, NULL, NULL},
+    {FT_md, "sha512", dgst_main, NULL, NULL},
+    {FT_md, "sha512-224", dgst_main, NULL, NULL},
+    {FT_md, "sha512-256", dgst_main, NULL, NULL},
+    {FT_md, "sha3-224", dgst_main, NULL, NULL},
+    {FT_md, "sha3-256", dgst_main, NULL, NULL},
+    {FT_md, "sha3-384", dgst_main, NULL, NULL},
+    {FT_md, "sha3-512", dgst_main, NULL, NULL},
+    {FT_md, "shake128", dgst_main, NULL, NULL},
+    {FT_md, "shake256", dgst_main, NULL, NULL},
+#ifndef OPENSSL_NO_MDC2
+    {FT_md, "mdc2", dgst_main, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_RMD160
+    {FT_md, "rmd160", dgst_main, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_BLAKE2
+    {FT_md, "blake2b512", dgst_main, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_BLAKE2
+    {FT_md, "blake2s256", dgst_main, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_SM3
+    {FT_md, "sm3", dgst_main, NULL, NULL},
+#endif
+    {FT_cipher, "aes-128-cbc", enc_main, enc_options, NULL},
+    {FT_cipher, "aes-128-ecb", enc_main, enc_options, NULL},
+    {FT_cipher, "aes-192-cbc", enc_main, enc_options, NULL},
+    {FT_cipher, "aes-192-ecb", enc_main, enc_options, NULL},
+    {FT_cipher, "aes-256-cbc", enc_main, enc_options, NULL},
+    {FT_cipher, "aes-256-ecb", enc_main, enc_options, NULL},
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-ctr", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-cfb1", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-128-cfb8", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-ctr", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-cfb1", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-192-cfb8", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-ctr", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-cfb1", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_ARIA
+    {FT_cipher, "aria-256-cfb8", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-128-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-128-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-192-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-192-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-256-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+    {FT_cipher, "camellia-256-ecb", enc_main, enc_options, NULL},
+#endif
+    {FT_cipher, "base64", enc_main, enc_options, NULL},
+#ifdef ZLIB
+    {FT_cipher, "zlib", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des3", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "desx", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_IDEA
+    {FT_cipher, "idea", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FT_cipher, "seed", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC4
+    {FT_cipher, "rc4", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC4
+    {FT_cipher, "rc4-40", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_BF
+    {FT_cipher, "bf", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC5
+    {FT_cipher, "rc5", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede3", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede3-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede3-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_DES
+    {FT_cipher, "des-ede3-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_IDEA
+    {FT_cipher, "idea-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_IDEA
+    {FT_cipher, "idea-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_IDEA
+    {FT_cipher, "idea-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_IDEA
+    {FT_cipher, "idea-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FT_cipher, "seed-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FT_cipher, "seed-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FT_cipher, "seed-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SEED
+    {FT_cipher, "seed-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-64-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC2
+    {FT_cipher, "rc2-40-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_BF
+    {FT_cipher, "bf-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_BF
+    {FT_cipher, "bf-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_BF
+    {FT_cipher, "bf-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_BF
+    {FT_cipher, "bf-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast5-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast5-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast5-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast5-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_CAST
+    {FT_cipher, "cast-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC5
+    {FT_cipher, "rc5-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC5
+    {FT_cipher, "rc5-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC5
+    {FT_cipher, "rc5-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_RC5
+    {FT_cipher, "rc5-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SM4
+    {FT_cipher, "sm4-cbc", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SM4
+    {FT_cipher, "sm4-ecb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SM4
+    {FT_cipher, "sm4-cfb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SM4
+    {FT_cipher, "sm4-ofb", enc_main, enc_options, NULL},
+#endif
+#ifndef OPENSSL_NO_SM4
+    {FT_cipher, "sm4-ctr", enc_main, enc_options, NULL},
+#endif
+    {0, NULL, NULL, NULL, NULL}
+};
Index: src/crypto/external/bsd/openssl/bin/progs.h
diff -u /dev/null src/crypto/external/bsd/openssl/bin/progs.h:1.1
--- /dev/null	Sun May  7 12:19:24 2023
+++ src/crypto/external/bsd/openssl/bin/progs.h	Sun May  7 12:19:24 2023
@@ -0,0 +1,123 @@
+/*
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
+ *
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "function.h"
+
+extern int asn1parse_main(int argc, char *argv[]);
+extern int ca_main(int argc, char *argv[]);
+extern int ciphers_main(int argc, char *argv[]);
+extern int cmp_main(int argc, char *argv[]);
+extern int cms_main(int argc, char *argv[]);
+extern int crl_main(int argc, char *argv[]);
+extern int crl2pkcs7_main(int argc, char *argv[]);
+extern int dgst_main(int argc, char *argv[]);
+extern int dhparam_main(int argc, char *argv[]);
+extern int dsa_main(int argc, char *argv[]);
+extern int dsaparam_main(int argc, char *argv[]);
+extern int ec_main(int argc, char *argv[]);
+extern int ecparam_main(int argc, char *argv[]);
+extern int enc_main(int argc, char *argv[]);
+extern int engine_main(int argc, char *argv[]);
+extern int errstr_main(int argc, char *argv[]);
+extern int fipsinstall_main(int argc, char *argv[]);
+extern int gendsa_main(int argc, char *argv[]);
+extern int genpkey_main(int argc, char *argv[]);
+extern int genrsa_main(int argc, char *argv[]);
+extern int help_main(int argc, char *argv[]);
+extern int info_main(int argc, char *argv[]);
+extern int kdf_main(int argc, char *argv[]);
+extern int list_main(int argc, char *argv[]);
+extern int mac_main(int argc, char *argv[]);
+extern int nseq_main(int argc, char *argv[]);
+extern int ocsp_main(int argc, char *argv[]);
+extern int passwd_main(int argc, char *argv[]);
+extern int pkcs12_main(int argc, char *argv[]);
+extern int pkcs7_main(int argc, char *argv[]);
+extern int pkcs8_main(int argc, char *argv[]);
+extern int pkey_main(int argc, char *argv[]);
+extern int pkeyparam_main(int argc, char *argv[]);
+extern int pkeyutl_main(int argc, char *argv[]);
+extern int prime_main(int argc, char *argv[]);
+extern int rand_main(int argc, char *argv[]);
+extern int rehash_main(int argc, char *argv[]);
+extern int req_main(int argc, char *argv[]);
+extern int rsa_main(int argc, char *argv[]);
+extern int rsautl_main(int argc, char *argv[]);
+extern int s_client_main(int argc, char *argv[]);
+extern int s_server_main(int argc, char *argv[]);
+extern int s_time_main(int argc, char *argv[]);
+extern int sess_id_main(int argc, char *argv[]);
+extern int smime_main(int argc, char *argv[]);
+extern int speed_main(int argc, char *argv[]);
+extern int spkac_main(int argc, char *argv[]);
+extern int srp_main(int argc, char *argv[]);
+extern int storeutl_main(int argc, char *argv[]);
+extern int ts_main(int argc, char *argv[]);
+extern int verify_main(int argc, char *argv[]);
+extern int version_main(int argc, char *argv[]);
+extern int x509_main(int argc, char *argv[]);
+
+extern const OPTIONS asn1parse_options[];
+extern const OPTIONS ca_options[];
+extern const OPTIONS ciphers_options[];
+extern const OPTIONS cmp_options[];
+extern const OPTIONS cms_options[];
+extern const OPTIONS crl_options[];
+extern const OPTIONS crl2pkcs7_options[];
+extern const OPTIONS dgst_options[];
+extern const OPTIONS dhparam_options[];
+extern const OPTIONS dsa_options[];
+extern const OPTIONS dsaparam_options[];
+extern const OPTIONS ec_options[];
+extern const OPTIONS ecparam_options[];
+extern const OPTIONS enc_options[];
+extern const OPTIONS engine_options[];
+extern const OPTIONS errstr_options[];
+extern const OPTIONS fipsinstall_options[];
+extern const OPTIONS gendsa_options[];
+extern const OPTIONS genpkey_options[];
+extern const OPTIONS genrsa_options[];
+extern const OPTIONS help_options[];
+extern const OPTIONS info_options[];
+extern const OPTIONS kdf_options[];
+extern const OPTIONS list_options[];
+extern const OPTIONS mac_options[];
+extern const OPTIONS nseq_options[];
+extern const OPTIONS ocsp_options[];
+extern const OPTIONS passwd_options[];
+extern const OPTIONS pkcs12_options[];
+extern const OPTIONS pkcs7_options[];
+extern const OPTIONS pkcs8_options[];
+extern const OPTIONS pkey_options[];
+extern const OPTIONS pkeyparam_options[];
+extern const OPTIONS pkeyutl_options[];
+extern const OPTIONS prime_options[];
+extern const OPTIONS rand_options[];
+extern const OPTIONS rehash_options[];
+extern const OPTIONS req_options[];
+extern const OPTIONS rsa_options[];
+extern const OPTIONS rsautl_options[];
+extern const OPTIONS s_client_options[];
+extern const OPTIONS s_server_options[];
+extern const OPTIONS s_time_options[];
+extern const OPTIONS sess_id_options[];
+extern const OPTIONS smime_options[];
+extern const OPTIONS speed_options[];
+extern const OPTIONS spkac_options[];
+extern const OPTIONS srp_options[];
+extern const OPTIONS storeutl_options[];
+extern const OPTIONS ts_options[];
+extern const OPTIONS verify_options[];
+extern const OPTIONS version_options[];
+extern const OPTIONS x509_options[];
+
+extern FUNCTION functions[];

Reply via email to