[src/trunk]: src/crypto/external/bsd/openssl/bin make this link

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/openssl/bin make this link
From: christos <christos%NetBSD.org@localhost>
Date: Sun, 07 May 2023 20:43:34 +0000
details:   https://anonhg.NetBSD.org/src/rev/baa351071ca5
branches:  trunk
changeset: 374597:baa351071ca5
user:      christos <christos%NetBSD.org@localhost>
date:      Sun May 07 16:19:24 2023 +0000

description:
make this link

diffstat:

 crypto/external/bsd/openssl/bin/Makefile |   83 +++++-
 crypto/external/bsd/openssl/bin/progs.c  |  397 +++++++++++++++++++++++++++++++
 crypto/external/bsd/openssl/bin/progs.h  |  123 +++++++++
 3 files changed, 586 insertions(+), 17 deletions(-)

diffs (truncated from 634 to 300 lines):

diff -r a438e55e1049 -r baa351071ca5 crypto/external/bsd/openssl/bin/Makefile
--- a/crypto/external/bsd/openssl/bin/Makefile  Sun May 07 16:05:07 2023 +0000
+++ b/crypto/external/bsd/openssl/bin/Makefile  Sun May 07 16:19:24 2023 +0000
@@ -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}
-CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
+CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} -I${.CURDIR}
+CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/apps/include
 
-LDADD+=        -lssl -lcrypto -lcrypt
-DPADD+=        ${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
+PROGDPLIBSSTATIC=yes
+PROGDPLIBS+=    apps ${OPENSSLSRC}/../lib/libapps
+PROGDPLIBS+=    ssl ${OPENSSLSRC}/../lib/libssl
+PROGDPLIBS+=    crypto ${OPENSSLSRC}/../lib/libcrypto
+
+LDADD+=        -lcrypt
+DPADD+=        ${LIBCRYPT}
 
 CRYPTODIST=    ${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
diff -r a438e55e1049 -r baa351071ca5 crypto/external/bsd/openssl/bin/progs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/bin/progs.c   Sun May 07 16:19:24 2023 +0000
@@ -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
Prev by Date: [src/trunk]: src/usr.sbin/wgconfig Don't allow "wgconfig add peer ..." to acc...
Next by Date: [src/trunk]: src/crypto/external/bsd/openssl/lib/engines more engines and map...
Previous by Thread: [src/trunk]: src/usr.sbin/wgconfig Don't allow "wgconfig add peer ..." to acc...
Next by Thread: [src/trunk]: src/crypto/external/bsd/openssl/lib/engines more engines and map...
Indexes:
Home | Main Index | Thread Index | Old Index