Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/openssl merge the rest of the changes, t...
details: https://anonhg.NetBSD.org/src/rev/0ec9970faf81
branches: trunk
changeset: 374606:0ec9970faf81
user: christos <christos%NetBSD.org@localhost>
date: Sun May 07 18:41:34 2023 +0000
description:
merge the rest of the changes, this now builds on x86_64.
diffstat:
crypto/external/bsd/openssl/bin/Makefile | 22 +-
crypto/external/bsd/openssl/bin/progs.h | 123 ---
crypto/external/bsd/openssl/include/crypto/bn_conf.h | 17 +-
crypto/external/bsd/openssl/include/crypto/dso_conf.h | 8 +-
crypto/external/bsd/openssl/include/openssl/configuration.h | 131 +++
crypto/external/bsd/openssl/include/openssl/fipskey.h | 36 +
crypto/external/bsd/openssl/include/openssl/opensslconf.h | 208 ------
crypto/external/bsd/openssl/include/openssl/opensslv.h | 114 +++
crypto/external/bsd/openssl/include/progs.h | 412 +-----------
9 files changed, 313 insertions(+), 758 deletions(-)
diffs (truncated from 1207 to 300 lines):
diff -r 1db12422c517 -r 0ec9970faf81 crypto/external/bsd/openssl/bin/Makefile
--- a/crypto/external/bsd/openssl/bin/Makefile Sun May 07 18:40:14 2023 +0000
+++ b/crypto/external/bsd/openssl/bin/Makefile Sun May 07 18:41:34 2023 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
-
-WARNS?= 2 # XXX -Wcast-qual
+# $NetBSD: Makefile,v 1.12 2023/05/07 18:41:34 christos Exp $
NOMAN= # defined
BINDIR=/usr/bin
@@ -9,22 +7,6 @@ BINDIR=/usr/bin
USE_FORT?= yes # cryptographic software
-# RCSid:
-# $Id: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
-#
-# @(#) Copyright (c) 1995 Simon J. Gerraty
-#
-# This file is provided in the hope that it will
-# be of use. There is absolutely NO WARRANTY.
-# Permission to copy, redistribute or otherwise
-# use this file is hereby granted provided that
-# the above copyright notice and this notice are
-# left intact.
-#
-# Please send copies of changes and bug-fixes to:
-# sjg%quick.com.au@localhost
-#
-
PROG= openssl
SRCS+= \
@@ -83,7 +65,7 @@ verify.c \
version.c \
x509.c \
-CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} -I${.CURDIR}
+CPPFLAGS+= -I${OPENSSLSRC} -I${.CURDIR}/../include
CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/apps/include
PROGDPLIBSSTATIC=yes
diff -r 1db12422c517 -r 0ec9970faf81 crypto/external/bsd/openssl/bin/progs.h
--- a/crypto/external/bsd/openssl/bin/progs.h Sun May 07 18:40:14 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
- * 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[];
diff -r 1db12422c517 -r 0ec9970faf81 crypto/external/bsd/openssl/include/crypto/bn_conf.h
--- a/crypto/external/bsd/openssl/include/crypto/bn_conf.h Sun May 07 18:40:14 2023 +0000
+++ b/crypto/external/bsd/openssl/include/crypto/bn_conf.h Sun May 07 18:41:34 2023 +0000
@@ -1,7 +1,9 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * 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
@@ -9,6 +11,7 @@
#ifndef OSSL_CRYPTO_BN_CONF_H
# define OSSL_CRYPTO_BN_CONF_H
+# pragma once
/*
* The contents of this file are not used in the UEFI build, as
@@ -19,12 +22,12 @@
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
-#if _LP64
-# define SIXTY_FOUR_BIT_LONG
+#ifdef _LP64
+#define SIXTY_FOUR_BIT_LONG
#elif _ILP64
-# define SIXTY_FOUR_BIT
+#define SIXTY_FOUR_BIT
#else
-# define THIRTY_TWO_BIT
-#endif
+#define THIRTY_TWO_BIT
+#endif
#endif
diff -r 1db12422c517 -r 0ec9970faf81 crypto/external/bsd/openssl/include/crypto/dso_conf.h
--- a/crypto/external/bsd/openssl/include/crypto/dso_conf.h Sun May 07 18:40:14 2023 +0000
+++ b/crypto/external/bsd/openssl/include/crypto/dso_conf.h Sun May 07 18:41:34 2023 +0000
@@ -1,7 +1,9 @@
+/* WARNING: do not edit! */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
/*
- * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * 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
@@ -9,6 +11,8 @@
#ifndef OSSL_CRYPTO_DSO_CONF_H
# define OSSL_CRYPTO_DSO_CONF_H
+# pragma once
+
# define DSO_DLFCN
# define HAVE_DLFCN_H
# define DSO_EXTENSION ".so"
diff -r 1db12422c517 -r 0ec9970faf81 crypto/external/bsd/openssl/include/openssl/configuration.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/openssl/include/openssl/configuration.h Sun May 07 18:41:34 2023 +0000
@@ -0,0 +1,131 @@
+/*
+ * WARNING: do not edit!
+ * Generated by configdata.pm from Configurations/common0.tmpl, Configurations/unix-Makefile.tmpl
+ * via Makefile.in
+ *
+ * Copyright 2016-2021 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
+ */
+
+#ifndef OPENSSL_CONFIGURATION_H
+# define OPENSSL_CONFIGURATION_H
+# pragma once
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# ifdef OPENSSL_ALGORITHM_DEFINES
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
+# endif
+
+/*
+ * OpenSSL was configured with the following options:
+ */
+
+# define OPENSSL_CONFIGURED_API 30000
+# ifndef OPENSSL_RAND_SEED_OS
+# define OPENSSL_RAND_SEED_OS
+# endif
+# ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+# endif
+# ifndef OPENSSL_NO_ACVP_TESTS
+# define OPENSSL_NO_ACVP_TESTS
+# endif
+# ifndef OPENSSL_NO_AFALGENG
+# define OPENSSL_NO_AFALGENG
+# endif
+# ifndef OPENSSL_NO_ASAN
+# define OPENSSL_NO_ASAN
+# endif
+# ifndef OPENSSL_NO_CRYPTO_MDEBUG
+# define OPENSSL_NO_CRYPTO_MDEBUG
+# endif
+# ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+# define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
+# endif
+# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+# endif
+# ifndef OPENSSL_NO_EGD
+# define OPENSSL_NO_EGD
+# endif
+# ifndef OPENSSL_NO_EXTERNAL_TESTS
+# define OPENSSL_NO_EXTERNAL_TESTS
+# endif
+# ifndef OPENSSL_NO_FIPS_SECURITYCHECKS
Home |
Main Index |
Thread Index |
Old Index