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/dist Import OpenSSL 1.1.1t
details: https://anonhg.NetBSD.org/src/rev/cdc88a4a0c79
branches: trunk
changeset: 373411:cdc88a4a0c79
user: christos <christos%NetBSD.org@localhost>
date: Tue Feb 07 22:17:59 2023 +0000
description:
Import OpenSSL 1.1.1t
Changes between 1.1.1s and 1.1.1t [7 Feb 2023]
*) Fixed X.400 address type confusion in X.509 GeneralName.
There is a type confusion vulnerability relating to X.400 address processing
inside an X.509 GeneralName. X.400 addresses were parsed as an ASN1_STRING
but subsequently interpreted by GENERAL_NAME_cmp as an ASN1_TYPE. This
vulnerability may allow an attacker who can provide a certificate chain and
CRL (neither of which need have a valid signature) to pass arbitrary
pointers to a memcmp call, creating a possible read primitive, subject to
some constraints. Refer to the advisory for more information. Thanks to
David Benjamin for discovering this issue. (CVE-2023-0286)
This issue has been fixed by changing the public header file definition of
GENERAL_NAME so that x400Address reflects the implementation. It was not
possible for any existing application to successfully use the existing
definition; however, if any application references the x400Address field
(e.g. in dead code), note that the type of this field has changed. There is
no ABI change.
[Hugo Landau]
*) Fixed Use-after-free following BIO_new_NDEF.
The public API function BIO_new_NDEF is a helper function used for
streaming ASN.1 data via a BIO. It is primarily used internally to OpenSSL
to support the SMIME, CMS and PKCS7 streaming capabilities, but may also
be called directly by end user applications.
The function receives a BIO from the caller, prepends a new BIO_f_asn1
filter BIO onto the front of it to form a BIO chain, and then returns
the new head of the BIO chain to the caller. Under certain conditions,
for example if a CMS recipient public key is invalid, the new filter BIO
is freed and the function returns a NULL result indicating a failure.
However, in this case, the BIO chain is not properly cleaned up and the
BIO passed by the caller still retains internal pointers to the previously
freed filter BIO. If the caller then goes on to call BIO_pop() on the BIO
then a use-after-free will occur. This will most likely result in a crash.
(CVE-2023-0215)
[Viktor Dukhovni, Matt Caswell]
*) Fixed Double free after calling PEM_read_bio_ex.
The function PEM_read_bio_ex() reads a PEM file from a BIO and parses and
decodes the "name" (e.g. "CERTIFICATE"), any header data and the payload
data. If the function succeeds then the "name_out", "header" and "data"
arguments are populated with pointers to buffers containing the relevant
decoded data. The caller is responsible for freeing those buffers. It is
possible to construct a PEM file that results in 0 bytes of payload data.
In this case PEM_read_bio_ex() will return a failure code but will populate
the header argument with a pointer to a buffer that has already been freed.
If the caller also frees this buffer then a double free will occur. This
will most likely lead to a crash.
The functions PEM_read_bio() and PEM_read() are simple wrappers around
PEM_read_bio_ex() and therefore these functions are also directly affected.
These functions are also called indirectly by a number of other OpenSSL
functions including PEM_X509_INFO_read_bio_ex() and
SSL_CTX_use_serverinfo_file() which are also vulnerable. Some OpenSSL
internal uses of these functions are not vulnerable because the caller does
not free the header argument if PEM_read_bio_ex() returns a failure code.
(CVE-2022-4450)
[Kurt Roeckx, Matt Caswell]
*) Fixed Timing Oracle in RSA Decryption.
A timing based side channel exists in the OpenSSL RSA Decryption
implementation which could be sufficient to recover a plaintext across
a network in a Bleichenbacher style attack. To achieve a successful
decryption an attacker would have to be able to send a very large number
of trial messages for decryption. The vulnerability affects all RSA padding
modes: PKCS#1 v1.5, RSA-OEAP and RSASVE.
(CVE-2022-4304)
[Dmitry Belyavsky, Hubert Kario]
Changes between 1.1.1r and 1.1.1s [1 Nov 2022]
*) Fixed a regression introduced in 1.1.1r version not refreshing the
certificate data to be signed before signing the certificate.
[Gibeom Gwon]
Changes between 1.1.1q and 1.1.1r [11 Oct 2022]
*) Fixed the linux-mips64 Configure target which was missing the
SIXTY_FOUR_BIT bn_ops flag. This was causing heap corruption on that
platform.
[Adam Joseph]
*) Fixed a strict aliasing problem in bn_nist. Clang-14 optimisation was
causing incorrect results in some cases as a result.
[Paul Dale]
*) Fixed SSL_pending() and SSL_has_pending() with DTLS which were failing to
report correct results in some cases
[Matt Caswell]
*) Fixed a regression introduced in 1.1.1o for re-signing certificates with
different key sizes
[Todd Short]
*) Added the loongarch64 target
[Shi Pujin]
*) Fixed a DRBG seed propagation thread safety issue
[Bernd Edlinger]
*) Fixed a memory leak in tls13_generate_secret
[Bernd Edlinger]
*) Fixed reported performance degradation on aarch64. Restored the
implementation prior to commit 2621751 ("aes/asm/aesv8-armx.pl: avoid
32-bit lane assignment in CTR mode") for 64bit targets only, since it is
reportedly 2-17% slower and the silicon errata only affects 32bit targets.
The new algorithm is still used for 32 bit targets.
[Bernd Edlinger]
*) Added a missing header for memcmp that caused compilation failure on some
platforms
[Gregor Jasny]
Changes between 1.1.1p and 1.1.1q [5 Jul 2022]
*) AES OCB mode for 32-bit x86 platforms using the AES-NI assembly optimised
implementation would not encrypt the entirety of the data under some
circumstances. This could reveal sixteen bytes of data that was
preexisting in the memory that wasn't written. In the special case of
"in place" encryption, sixteen bytes of the plaintext would be revealed.
Since OpenSSL does not support OCB based cipher suites for TLS and DTLS,
they are both unaffected.
(CVE-2022-2097)
[Alex Chernyakhovsky, David Benjamin, Alejandro Sedeño]
Changes between 1.1.1o and 1.1.1p [21 Jun 2022]
*) In addition to the c_rehash shell command injection identified in
CVE-2022-1292, further bugs where the c_rehash script does not
properly sanitise shell metacharacters to prevent command injection have
been fixed.
When the CVE-2022-1292 was fixed it was not discovered that there
are other places in the script where the file names of certificates
being hashed were possibly passed to a command executed through the shell.
This script is distributed by some operating systems in a manner where
it is automatically executed. On such operating systems, an attacker
could execute arbitrary commands with the privileges of the script.
Use of the c_rehash script is considered obsolete and should be replaced
by the OpenSSL rehash command line tool.
(CVE-2022-2068)
[Daniel Fiala, Tomáš Mráz]
*) When OpenSSL TLS client is connecting without any supported elliptic
curves and TLS-1.3 protocol is disabled the connection will no longer fail
if a ciphersuite that does not use a key exchange based on elliptic
curves can be negotiated.
[Tomáš Mráz]
Changes between 1.1.1n and 1.1.1o [3 May 2022]
*) Fixed a bug in the c_rehash script which was not properly sanitising shell
metacharacters to prevent command injection. This script is distributed
by some operating systems in a manner where it is automatically executed.
On such operating systems, an attacker could execute arbitrary commands
with the privileges of the script.
Use of the c_rehash script is considered obsolete and should be replaced
by the OpenSSL rehash command line tool.
(CVE-2022-1292)
[Tomáš Mráz]
diffstat:
crypto/external/bsd/openssl/dist/Configurations/10-main.conf | 16 +-
crypto/external/bsd/openssl/dist/apps/apps.c | 17 +-
crypto/external/bsd/openssl/dist/apps/apps.h | 11 +-
crypto/external/bsd/openssl/dist/apps/s_cb.c | 28 +-
crypto/external/bsd/openssl/dist/apps/x509.c | 16 +-
crypto/external/bsd/openssl/dist/config | 3 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86.pl | 6 +-
crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl | 64 +-
crypto/external/bsd/openssl/dist/crypto/asn1/bio_asn1.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/asn1/bio_ndef.c | 41 +-
crypto/external/bsd/openssl/dist/crypto/asn1/charmap.pl | 9 +-
crypto/external/bsd/openssl/dist/crypto/bio/b_print.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/bn/asm/x86_64-mont5.pl | 198 +---
crypto/external/bsd/openssl/dist/crypto/bn/bn_blind.c | 16 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_div.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_err.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_gcd.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_local.h | 36 +-
crypto/external/bsd/openssl/dist/crypto/bn/bn_prime.pl | 9 +-
crypto/external/bsd/openssl/dist/crypto/bn/build.info | 3 +-
crypto/external/bsd/openssl/dist/crypto/bn/rsa_sup_mul.c | 614 ++++++++++
crypto/external/bsd/openssl/dist/crypto/bn/rsaz_exp.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/bn/rsaz_exp.h | 25 +-
crypto/external/bsd/openssl/dist/crypto/cms/cms_enc.c | 5 +
crypto/external/bsd/openssl/dist/crypto/cms/cms_err.c | 2 +
crypto/external/bsd/openssl/dist/crypto/conf/keysets.pl | 10 +-
crypto/external/bsd/openssl/dist/crypto/ec/curve448/curve448.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/ec/ecp_nistz256.c | 3 +-
crypto/external/bsd/openssl/dist/crypto/engine/eng_dyn.c | 33 +-
crypto/external/bsd/openssl/dist/crypto/err/err.c | 45 +-
crypto/external/bsd/openssl/dist/crypto/err/openssl.txt | 5 +-
crypto/external/bsd/openssl/dist/crypto/evp/bio_enc.c | 9 +-
crypto/external/bsd/openssl/dist/crypto/evp/evp_local.h | 4 +-
crypto/external/bsd/openssl/dist/crypto/init.c | 13 +-
crypto/external/bsd/openssl/dist/crypto/objects/obj_dat.pl | 11 +-
crypto/external/bsd/openssl/dist/crypto/objects/objects.pl | 13 +-
crypto/external/bsd/openssl/dist/crypto/objects/objxref.pl | 13 +-
crypto/external/bsd/openssl/dist/crypto/pem/pem_lib.c | 10 +-
crypto/external/bsd/openssl/dist/crypto/rand/drbg_lib.c | 20 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_lib.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_vms.c | 90 +-
crypto/external/bsd/openssl/dist/crypto/rand/rand_win.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ameth.c | 1 +
crypto/external/bsd/openssl/dist/crypto/rsa/rsa_ossl.c | 19 +-
crypto/external/bsd/openssl/dist/crypto/s390x_arch.h | 5 +-
crypto/external/bsd/openssl/dist/crypto/s390xcap.c | 5 +-
crypto/external/bsd/openssl/dist/crypto/txt_db/txt_db.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509/by_dir.c | 18 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_cmp.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/x509/x509_req.c | 46 +-
crypto/external/bsd/openssl/dist/crypto/x509/x_all.c | 11 +-
crypto/external/bsd/openssl/dist/crypto/x509/x_crl.c | 14 +-
crypto/external/bsd/openssl/dist/crypto/x509/x_name.c | 8 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_asid.c | 33 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_genn.c | 4 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_lib.c | 6 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_sxnet.c | 22 +-
crypto/external/bsd/openssl/dist/crypto/x509v3/v3_utl.c | 9 +-
crypto/external/bsd/openssl/dist/doc/fingerprints.txt | 10 +
crypto/external/bsd/openssl/dist/doc/man1/x509.pod | 24 +-
crypto/external/bsd/openssl/dist/doc/man3/BIO_f_base64.pod | 5 +-
crypto/external/bsd/openssl/dist/doc/man3/CMS_add0_cert.pod | 32 +-
crypto/external/bsd/openssl/dist/doc/man3/CMS_verify.pod | 81 +-
crypto/external/bsd/openssl/dist/doc/man3/EC_KEY_new.pod | 20 +-
crypto/external/bsd/openssl/dist/doc/man3/EVP_EncryptInit.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_LH_COMPFUNC.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/OPENSSL_init_crypto.pod | 4 +-
crypto/external/bsd/openssl/dist/doc/man3/PKCS7_sign.pod | 47 +-
crypto/external/bsd/openssl/dist/doc/man3/PKCS7_sign_add_signer.pod | 55 +-
crypto/external/bsd/openssl/dist/doc/man3/PKCS7_verify.pod | 104 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set1_verify_cert_store.pod | 15 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_CTX_set_timeout.pod | 12 +-
crypto/external/bsd/openssl/dist/doc/man3/SSL_get_current_cipher.pod | 6 +-
crypto/external/bsd/openssl/dist/doc/man3/X509_STORE_CTX_new.pod | 10 +-
crypto/external/bsd/openssl/dist/engines/asm/e_padlock-x86.pl | 4 +-
crypto/external/bsd/openssl/dist/engines/asm/e_padlock-x86_64.pl | 4 +-
crypto/external/bsd/openssl/dist/include/crypto/bn.h | 7 +-
crypto/external/bsd/openssl/dist/include/openssl/bnerr.h | 3 +-
crypto/external/bsd/openssl/dist/include/openssl/cmserr.h | 1 +
crypto/external/bsd/openssl/dist/include/openssl/opensslv.h | 6 +-
crypto/external/bsd/openssl/dist/include/openssl/ssl.h | 12 +-
crypto/external/bsd/openssl/dist/include/openssl/x509v3.h | 4 +-
crypto/external/bsd/openssl/dist/ssl/packet.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/packet_local.h | 39 +-
crypto/external/bsd/openssl/dist/ssl/record/rec_layer_s3.c | 33 +-
crypto/external/bsd/openssl/dist/ssl/record/ssl3_buffer.c | 9 +-
crypto/external/bsd/openssl/dist/ssl/record/ssl3_record.c | 16 +-
crypto/external/bsd/openssl/dist/ssl/ssl_cert.c | 6 +
crypto/external/bsd/openssl/dist/ssl/ssl_init.c | 19 +-
crypto/external/bsd/openssl/dist/ssl/ssl_local.h | 3 +-
crypto/external/bsd/openssl/dist/ssl/ssl_rsa.c | 83 +-
crypto/external/bsd/openssl/dist/ssl/ssl_txt.c | 6 +-
crypto/external/bsd/openssl/dist/ssl/statem/extensions_clnt.c | 23 +-
crypto/external/bsd/openssl/dist/ssl/statem/extensions_srvr.c | 21 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_clnt.c | 7 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_dtls.c | 8 +-
crypto/external/bsd/openssl/dist/ssl/statem/statem_srvr.c | 23 +-
crypto/external/bsd/openssl/dist/ssl/tls13_enc.c | 3 +-
crypto/external/bsd/openssl/dist/test/certs/ee-ed25519.pem | 43 +-
crypto/external/bsd/openssl/dist/test/certs/embeddedSCTs1-key.pem | 38 +-
crypto/external/bsd/openssl/dist/test/certs/embeddedSCTs1.pem | 35 +-
crypto/external/bsd/openssl/dist/test/certs/embeddedSCTs1.sct | 12 +-
crypto/external/bsd/openssl/dist/test/certs/embeddedSCTs1_issuer-key.pem | 15 +
crypto/external/bsd/openssl/dist/test/certs/embeddedSCTs1_issuer.pem | 30 +-
crypto/external/bsd/openssl/dist/test/certs/root-ed25519.pem | 45 +-
crypto/external/bsd/openssl/dist/test/certs/rootCA.pem | 94 +-
crypto/external/bsd/openssl/dist/test/ct_test.c | 4 +-
crypto/external/bsd/openssl/dist/test/dtls_mtu_test.c | 50 +-
crypto/external/bsd/openssl/dist/test/dtlstest.c | 90 +-
crypto/external/bsd/openssl/dist/test/ec_internal_test.c | 36 +-
crypto/external/bsd/openssl/dist/test/pemtest.c | 32 +-
crypto/external/bsd/openssl/dist/test/recipes/10-test_bn_data/bnmod.txt | 65 +
crypto/external/bsd/openssl/dist/test/recipes/25-test_x509.t | 63 +-
crypto/external/bsd/openssl/dist/test/recipes/30-test_evp_data/evpciph.txt | 52 +-
crypto/external/bsd/openssl/dist/test/recipes/70-test_tls13hrr.t | 53 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_cms.t | 17 +-
crypto/external/bsd/openssl/dist/test/recipes/80-test_ssl_new.t | 6 +-
crypto/external/bsd/openssl/dist/test/recipes/95-test_external_pyca_data/cryptography.sh | 20 +-
crypto/external/bsd/openssl/dist/test/smime-certs/badrsa.pem | 18 +
crypto/external/bsd/openssl/dist/test/smime-certs/mksmime-certs.sh | 24 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smdh.pem | 72 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smdsa1.pem | 86 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smdsa2.pem | 86 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smdsa3.pem | 86 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smec1.pem | 36 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smec2.pem | 38 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smroot.pem | 90 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smrsa1.pem | 90 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smrsa2.pem | 90 +-
crypto/external/bsd/openssl/dist/test/smime-certs/smrsa3.pem | 90 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/10-resumption.conf | 121 +-
crypto/external/bsd/openssl/dist/test/ssl-tests/11-dtls_resumption.conf | 124 ++-
crypto/external/bsd/openssl/dist/test/ssl-tests/30-supported-groups.conf | 54 +
crypto/external/bsd/openssl/dist/test/ssl-tests/30-supported-groups.conf.in | 45 +
crypto/external/bsd/openssl/dist/test/ssl-tests/protocol_version.pm | 65 +-
crypto/external/bsd/openssl/dist/test/sslapitest.c | 566 ++++++++-
crypto/external/bsd/openssl/dist/test/ssltestlib.c | 35 +-
crypto/external/bsd/openssl/dist/test/ssltestlib.h | 3 +-
crypto/external/bsd/openssl/dist/test/test_test.c | 398 +++---
crypto/external/bsd/openssl/dist/test/v3ext.c | 295 ++++-
crypto/external/bsd/openssl/dist/test/v3nametest.c | 10 +-
crypto/external/bsd/openssl/dist/test/x509_internal_test.c | 57 +-
crypto/external/bsd/openssl/dist/tools/c_rehash.in | 231 ++-
crypto/external/bsd/openssl/dist/util/perl/OpenSSL/copyright.pm | 41 +
crypto/external/bsd/openssl/dist/util/private.num | 4 +
145 files changed, 4521 insertions(+), 1597 deletions(-)
diffs (truncated from 9496 to 300 lines):
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/Configurations/10-main.conf
--- a/crypto/external/bsd/openssl/dist/Configurations/10-main.conf Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/Configurations/10-main.conf Tue Feb 07 22:17:59 2023 +0000
@@ -742,7 +742,7 @@
inherit_from => [ "linux-generic32", asm("mips64_asm") ],
cflags => add("-mabi=n32"),
cxxflags => add("-mabi=n32"),
- bn_ops => "RC4_CHAR",
+ bn_ops => "RC4_CHAR SIXTY_FOUR_BIT",
perlasm_scheme => "n32",
multilib => "32",
},
@@ -761,6 +761,13 @@
perlasm_scheme => "linux64",
},
+ # loongarch64 below refers to contemporary LoongArch Architecture
+ # specifications,
+ "linux64-loongarch64" => {
+ inherit_from => [ "linux-generic64"],
+ perlasm_scheme => "linux64",
+ },
+
#### IA-32 targets...
#### These two targets are a bit aged and are to be used on older Linux
#### machines where gcc doesn't understand -m32 and -m64
@@ -995,6 +1002,13 @@
perlasm_scheme => "linux64",
},
+ "BSD-aarch64" => {
+ inherit_from => [ "BSD-generic64", asm("aarch64_asm") ],
+ lib_cppflags => add("-DL_ENDIAN"),
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
+ perlasm_scheme => "linux64",
+ },
+
"bsdi-elf-gcc" => {
inherit_from => [ "BASE_unix", asm("x86_elf_asm") ],
CC => "gcc",
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/apps/apps.c
--- a/crypto/external/bsd/openssl/dist/apps/apps.c Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/apps.c Tue Feb 07 22:17:59 2023 +0000
@@ -307,6 +307,8 @@
if (cb_data != NULL && cb_data->password != NULL
&& *(const char*)cb_data->password != '\0')
pw_min_len = 1;
+ else if (!verify)
+ pw_min_len = 0;
prompt = UI_construct_prompt(ui, "pass phrase", prompt_info);
if (!prompt) {
BIO_printf(bio_err, "Out of memory\n");
@@ -1374,7 +1376,8 @@
static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
#undef BSIZE
#define BSIZE 256
-BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai)
+BIGNUM *load_serial(const char *serialfile, int *exists, int create,
+ ASN1_INTEGER **retai)
{
BIO *in = NULL;
BIGNUM *ret = NULL;
@@ -1386,6 +1389,8 @@
goto err;
in = BIO_new_file(serialfile, "r");
+ if (exists != NULL)
+ *exists = in != NULL;
if (in == NULL) {
if (!create) {
perror(serialfile);
@@ -1393,8 +1398,14 @@
}
ERR_clear_error();
ret = BN_new();
- if (ret == NULL || !rand_serial(ret, ai))
+ if (ret == NULL) {
BIO_printf(bio_err, "Out of memory\n");
+ } else if (!rand_serial(ret, ai)) {
+ BIO_printf(bio_err, "Error creating random number to store in %s\n",
+ serialfile);
+ BN_free(ret);
+ ret = NULL;
+ }
} else {
if (!a2i_ASN1_INTEGER(in, ai, buf, 1024)) {
BIO_printf(bio_err, "unable to load number from %s\n",
@@ -1414,6 +1425,8 @@
ai = NULL;
}
err:
+ if (ret == NULL)
+ ERR_print_errors(bio_err);
BIO_free(in);
ASN1_INTEGER_free(ai);
return ret;
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/apps/apps.h
--- a/crypto/external/bsd/openssl/dist/apps/apps.h Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/apps.h Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -527,9 +527,12 @@
} CA_DB;
void* app_malloc(int sz, const char *what);
-BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai);
-int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,
- ASN1_INTEGER **retai);
+
+/* load_serial, save_serial, and rotate_serial are also used for CRL numbers */
+BIGNUM *load_serial(const char *serialfile, int *exists, int create,
+ ASN1_INTEGER **retai);
+int save_serial(const char *serialfile, const char *suffix,
+ const BIGNUM *serial, ASN1_INTEGER **retai);
int rotate_serial(const char *serialfile, const char *new_suffix,
const char *old_suffix);
int rand_serial(BIGNUM *b, ASN1_INTEGER *ai);
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/apps/s_cb.c
--- a/crypto/external/bsd/openssl/dist/apps/s_cb.c Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/s_cb.c Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -74,22 +74,28 @@
}
switch (err) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
- BIO_puts(bio_err, "issuer= ");
- X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert),
- 0, get_nameopt());
- BIO_puts(bio_err, "\n");
+ if (err_cert != NULL) {
+ BIO_puts(bio_err, "issuer= ");
+ X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert),
+ 0, get_nameopt());
+ BIO_puts(bio_err, "\n");
+ }
break;
case X509_V_ERR_CERT_NOT_YET_VALID:
case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
- BIO_printf(bio_err, "notBefore=");
- ASN1_TIME_print(bio_err, X509_get0_notBefore(err_cert));
- BIO_printf(bio_err, "\n");
+ if (err_cert != NULL) {
+ BIO_printf(bio_err, "notBefore=");
+ ASN1_TIME_print(bio_err, X509_get0_notBefore(err_cert));
+ BIO_printf(bio_err, "\n");
+ }
break;
case X509_V_ERR_CERT_HAS_EXPIRED:
case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
- BIO_printf(bio_err, "notAfter=");
- ASN1_TIME_print(bio_err, X509_get0_notAfter(err_cert));
- BIO_printf(bio_err, "\n");
+ if (err_cert != NULL) {
+ BIO_printf(bio_err, "notAfter=");
+ ASN1_TIME_print(bio_err, X509_get0_notAfter(err_cert));
+ BIO_printf(bio_err, "\n");
+ }
break;
case X509_V_ERR_NO_EXPLICIT_POLICY:
if (!verify_args.quiet)
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/apps/x509.c
--- a/crypto/external/bsd/openssl/dist/apps/x509.c Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/apps/x509.c Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -400,7 +400,7 @@
aliasout = ++num;
break;
case OPT_CACREATESERIAL:
- CA_createserial = ++num;
+ CA_createserial = 1;
break;
case OPT_CLREXT:
clrext = 1;
@@ -590,6 +590,8 @@
xca = load_cert(CAfile, CAformat, "CA Certificate");
if (xca == NULL)
goto end;
+ if (reqfile && !X509_set_issuer_name(x, X509_get_subject_name(xca)))
+ goto end;
}
out = bio_open_default(outfile, 'w', outformat);
@@ -914,6 +916,7 @@
char *buf = NULL;
ASN1_INTEGER *bs = NULL;
BIGNUM *serial = NULL;
+ int defaultfile = 0, file_exists;
if (serialfile == NULL) {
const char *p = strrchr(CAfile, '.');
@@ -923,9 +926,10 @@
memcpy(buf, CAfile, len);
memcpy(buf + len, POSTFIX, sizeof(POSTFIX));
serialfile = buf;
+ defaultfile = 1;
}
- serial = load_serial(serialfile, create, NULL);
+ serial = load_serial(serialfile, &file_exists, create || defaultfile, NULL);
if (serial == NULL)
goto end;
@@ -934,8 +938,10 @@
goto end;
}
- if (!save_serial(serialfile, NULL, serial, &bs))
- goto end;
+ if (file_exists || create)
+ save_serial(serialfile, NULL, serial, &bs);
+ else
+ bs = BN_to_ASN1_INTEGER(serial, NULL);
end:
OPENSSL_free(buf);
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/config
--- a/crypto/external/bsd/openssl/dist/config Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/config Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -709,6 +709,7 @@
ia64-*-*bsd*) OUT="BSD-ia64" ;;
x86_64-*-dragonfly*) OUT="BSD-x86_64" ;;
amd64-*-*bsd*) OUT="BSD-x86_64" ;;
+ arm64-*-*bsd*) OUT="BSD-aarch64" ;;
*86*-*-*bsd*) # mimic ld behaviour when it's looking for libc...
if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
libc=/usr/lib/libc.so
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86.pl
--- a/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86.pl Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesni-x86.pl Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
-# Copyright 2009-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2009-2022 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -2027,7 +2027,7 @@
&movdqu (&QWP(-16*2,$out,$inp),$inout4);
&movdqu (&QWP(-16*1,$out,$inp),$inout5);
&cmp ($inp,$len); # done yet?
- &jb (&label("grandloop"));
+ &jbe (&label("grandloop"));
&set_label("short");
&add ($len,16*6);
@@ -2453,7 +2453,7 @@
&pxor ($rndkey1,$inout5);
&movdqu (&QWP(-16*1,$out,$inp),$inout5);
&cmp ($inp,$len); # done yet?
- &jb (&label("grandloop"));
+ &jbe (&label("grandloop"));
&set_label("short");
&add ($len,16*6);
diff -r 48fe087059ea -r cdc88a4a0c79 crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl
--- a/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl Tue Feb 07 20:45:44 2023 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/aes/asm/aesv8-armx.pl Tue Feb 07 22:17:59 2023 +0000
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
-# Copyright 2014-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2014-2022 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the OpenSSL license (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -740,6 +740,21 @@
#ifndef __ARMEB__
rev $ctr, $ctr
#endif
+___
+$code.=<<___ if ($flavour =~ /64/);
+ vorr $dat1,$dat0,$dat0
+ add $tctr1, $ctr, #1
+ vorr $dat2,$dat0,$dat0
+ add $ctr, $ctr, #2
+ vorr $ivec,$dat0,$dat0
+ rev $tctr1, $tctr1
Home |
Main Index |
Thread Index |
Old Index