From 1e53c08d9d3beac26dbeb2f1f9d9457400ef4a7a Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 31 Jan 2024 02:22:16 +0000 Subject: [PATCH] Android OpenSSL => 3.2.1. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4820 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- .../usr/local/include/crypto/aes_platform.h | 20 +++++++++---------- .../usr/local/include/crypto/conferr.h | 2 +- .../mingw64/usr/local/include/crypto/x509.h | 19 +++++++++++++++++- .../mingw64/usr/local/include/internal/ktls.h | 8 +++++++- .../usr/local/include/openssl/conferr.h | 3 ++- .../usr/local/include/openssl/e_ostime.h | 10 +++++++++- .../usr/local/include/openssl/opensslv.h | 10 +++++----- tools/ssl-mingw64 | 2 +- 8 files changed, 53 insertions(+), 21 deletions(-) diff --git a/deps/openssl/mingw64/usr/local/include/crypto/aes_platform.h b/deps/openssl/mingw64/usr/local/include/crypto/aes_platform.h index e641450b..a7cae5d4 100644 --- a/deps/openssl/mingw64/usr/local/include/crypto/aes_platform.h +++ b/deps/openssl/mingw64/usr/local/include/crypto/aes_platform.h @@ -1,5 +1,5 @@ /* - * Copyright 2019-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2019-2024 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 @@ -65,16 +65,16 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # ifdef VPAES_ASM # define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC) # endif -# define HWAES_CAPABLE (OPENSSL_ppccap_P & PPC_CRYPTO207) -# define HWAES_set_encrypt_key aes_p8_set_encrypt_key -# define HWAES_set_decrypt_key aes_p8_set_decrypt_key -# define HWAES_encrypt aes_p8_encrypt -# define HWAES_decrypt aes_p8_decrypt -# define HWAES_cbc_encrypt aes_p8_cbc_encrypt -# define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks -# define HWAES_xts_encrypt aes_p8_xts_encrypt -# define HWAES_xts_decrypt aes_p8_xts_decrypt # if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX) +# define HWAES_CAPABLE (OPENSSL_ppccap_P & PPC_CRYPTO207) +# define HWAES_set_encrypt_key aes_p8_set_encrypt_key +# define HWAES_set_decrypt_key aes_p8_set_decrypt_key +# define HWAES_encrypt aes_p8_encrypt +# define HWAES_decrypt aes_p8_decrypt +# define HWAES_cbc_encrypt aes_p8_cbc_encrypt +# define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks +# define HWAES_xts_encrypt aes_p8_xts_encrypt +# define HWAES_xts_decrypt aes_p8_xts_decrypt # define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300) # define AES_GCM_ENC_BYTES 128 # define AES_GCM_DEC_BYTES 128 diff --git a/deps/openssl/mingw64/usr/local/include/crypto/conferr.h b/deps/openssl/mingw64/usr/local/include/crypto/conferr.h index cb367e4f..fc964512 100644 --- a/deps/openssl/mingw64/usr/local/include/crypto/conferr.h +++ b/deps/openssl/mingw64/usr/local/include/crypto/conferr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2020-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 diff --git a/deps/openssl/mingw64/usr/local/include/crypto/x509.h b/deps/openssl/mingw64/usr/local/include/crypto/x509.h index 5765b9f7..18eb2f7c 100644 --- a/deps/openssl/mingw64/usr/local/include/crypto/x509.h +++ b/deps/openssl/mingw64/usr/local/include/crypto/x509.h @@ -1,5 +1,5 @@ /* - * Copyright 2015-2023 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2015-2024 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 @@ -371,4 +371,21 @@ int ossl_x509_check_private_key(const EVP_PKEY *k, const EVP_PKEY *pkey); int x509v3_add_len_value_uchar(const char *name, const unsigned char *value, size_t vallen, STACK_OF(CONF_VALUE) **extlist); +/* Attribute addition functions not checking for duplicate attributes */ +STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, + X509_ATTRIBUTE *attr); +STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x, + const ASN1_OBJECT *obj, + int type, + const unsigned char *bytes, + int len); +STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x, + int nid, int type, + const unsigned char *bytes, + int len); +STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, + const char *attrname, + int type, + const unsigned char *bytes, + int len); #endif /* OSSL_CRYPTO_X509_H */ diff --git a/deps/openssl/mingw64/usr/local/include/internal/ktls.h b/deps/openssl/mingw64/usr/local/include/internal/ktls.h index af27a325..072653dc 100644 --- a/deps/openssl/mingw64/usr/local/include/internal/ktls.h +++ b/deps/openssl/mingw64/usr/local/include/internal/ktls.h @@ -1,5 +1,5 @@ /* - * Copyright 2018-2022 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2018-2024 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 @@ -80,6 +80,12 @@ static ossl_inline int ktls_start(int fd, ktls_crypto_info_t *tls_en, int is_tx) # endif } +/* Not supported on FreeBSD */ +static ossl_inline int ktls_enable_tx_zerocopy_sendfile(int fd) +{ + return 0; +} + /* * Send a TLS record using the tls_en provided in ktls_start and use * record_type instead of the default SSL3_RT_APPLICATION_DATA. diff --git a/deps/openssl/mingw64/usr/local/include/openssl/conferr.h b/deps/openssl/mingw64/usr/local/include/openssl/conferr.h index 496e2e1e..a8798e79 100644 --- a/deps/openssl/mingw64/usr/local/include/openssl/conferr.h +++ b/deps/openssl/mingw64/usr/local/include/openssl/conferr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * 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 @@ -38,6 +38,7 @@ # define CONF_R_NUMBER_TOO_LARGE 121 # define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124 # define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 +# define CONF_R_RECURSIVE_SECTION_REFERENCE 126 # define CONF_R_RELATIVE_PATH 125 # define CONF_R_SSL_COMMAND_SECTION_EMPTY 117 # define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118 diff --git a/deps/openssl/mingw64/usr/local/include/openssl/e_ostime.h b/deps/openssl/mingw64/usr/local/include/openssl/e_ostime.h index 8a7cc988..0e174875 100644 --- a/deps/openssl/mingw64/usr/local/include/openssl/e_ostime.h +++ b/deps/openssl/mingw64/usr/local/include/openssl/e_ostime.h @@ -22,7 +22,15 @@ */ # if defined(OPENSSL_SYS_WINDOWS) -# include +# if !defined(_WINSOCKAPI_) + /* + * winsock2.h defines _WINSOCK2API_ and both winsock2.h and winsock.h define + * _WINSOCKAPI_. Both of these provide struct timeval. Don't include + * winsock2.h if either header has been included to avoid breakage with + * applications that prefer to use over . + */ +# include +# endif # else # include # endif diff --git a/deps/openssl/mingw64/usr/local/include/openssl/opensslv.h b/deps/openssl/mingw64/usr/local/include/openssl/opensslv.h index 7f1ecf66..b38d64da 100644 --- a/deps/openssl/mingw64/usr/local/include/openssl/opensslv.h +++ b/deps/openssl/mingw64/usr/local/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 2 -# define OPENSSL_VERSION_PATCH 0 +# define OPENSSL_VERSION_PATCH 1 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.2.0" -# define OPENSSL_FULL_VERSION_STR "3.2.0" +# define OPENSSL_VERSION_STR "3.2.1" +# define OPENSSL_FULL_VERSION_STR "3.2.1" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "23 Nov 2023" +# define OPENSSL_RELEASE_DATE "30 Jan 2024" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.0 23 Nov 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.1 30 Jan 2024" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/tools/ssl-mingw64 b/tools/ssl-mingw64 index 31c07e9c..70d94cea 100755 --- a/tools/ssl-mingw64 +++ b/tools/ssl-mingw64 @@ -1,6 +1,6 @@ #!/bin/sh -OPENSSL_VERSION=3.2.0 +OPENSSL_VERSION=3.2.1 API_LEVEL=24