deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package/tor: bump version to 0.4.8.4 

Release notes:
https://forum.torproject.org/t/stable-release-0-4-8-4/8884

Removed all patches due to upstream commit adding compatibility with
LibreSSL 3.5:
f3dabd705f

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
MyCruft^2
Bernd Kuhls 2023-08-25 17:50:01 +02:00 committed by Thomas Petazzoni
parent 0a0786bc78
commit cb83990af5
6 changed files with 3 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.checkpackageignore
View File

@ -1428,9 +1428,6 @@ package/tinydtls/0001-sha2-sha2.c-fix-build-on-big-endian.patch Upstream
package/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch Upstream
package/tinyproxy/0001-prevent-junk-from-showing-up-in-error-page-in-invalid-requests.patch Upstream
package/tinyxml/0001-In-stamp-always-advance-the-pointer-if-p-0xef.patch Upstream
package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch Upstream
package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch Upstream
package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch Upstream
package/tpm2-abrmd/S80tpm2-abrmd Indent Shellcheck Variables
package/tpm2-tss/0001-Temporary-fix-for-build-without-C.patch Upstream
package/transmission/S92transmission ConsecutiveEmptyLines Indent Shellcheck Variables

67
package/tor/0001-patch-src_lib_crypt_ops_crypto_dh_openssl_c.patch
View File

@ -1,67 +0,0 @@
Fix build with opaque structs in LibreSSL 3.5
Downloaded from OpenBSD ports:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_dh_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup
Patch series was sent upstream:
https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Index: src/lib/crypt_ops/crypto_dh_openssl.c
--- a/src/lib/crypt_ops/crypto_dh_openssl.c.orig
+++ b/src/lib/crypt_ops/crypto_dh_openssl.c
@@ -60,7 +60,7 @@ crypto_validate_dh_params(const BIGNUM *p, const BIGNU
/* Copy into a temporary DH object, just so that DH_check() can be called. */
if (!(dh = DH_new()))
goto out;
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
BIGNUM *dh_p, *dh_g;
if (!(dh_p = BN_dup(p)))
goto out;
@@ -223,7 +223,7 @@ new_openssl_dh_from_params(BIGNUM *p, BIGNUM *g)
goto err;
}
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
if (!DH_set0_pqg(res_dh, dh_p, NULL, dh_g)) {
goto err;
@@ -276,7 +276,7 @@ crypto_dh_get_bytes(crypto_dh_t *dh)
int
crypto_dh_generate_public(crypto_dh_t *dh)
{
-#ifndef OPENSSL_1_1_API
+#if !defined(OPENSSL_1_1_API) && !defined(LIBRESSL_VERSION_NUMBER)
again:
#endif
if (!DH_generate_key(dh->dh)) {
@@ -286,7 +286,7 @@ crypto_dh_generate_public(crypto_dh_t *dh)
return -1;
/* LCOV_EXCL_STOP */
}
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
/* OpenSSL 1.1.x doesn't appear to let you regenerate a DH key, without
* recreating the DH object. I have no idea what sort of aliasing madness
* can occur here, so do the check, and just bail on failure.
@@ -327,7 +327,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si
const BIGNUM *dh_pub;
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
const BIGNUM *dh_priv;
DH_get0_key(dh->dh, &dh_pub, &dh_priv);
#else
@@ -338,7 +338,7 @@ crypto_dh_get_public(crypto_dh_t *dh, char *pubkey, si
if (crypto_dh_generate_public(dh)<0)
return -1;
else {
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
DH_get0_key(dh->dh, &dh_pub, &dh_priv);
#else
dh_pub = dh->dh->pub_key;

58
package/tor/0002-patch-src_lib_crypt_ops_crypto_rsa_openssl_c.patch
View File

@ -1,58 +0,0 @@
Fix build with opaque structs in LibreSSL 3.5
Downloaded from OpenBSD ports:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_crypt_ops_crypto_rsa_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup
Patch series was sent upstream:
https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Index: src/lib/crypt_ops/crypto_rsa_openssl.c
--- a/src/lib/crypt_ops/crypto_rsa_openssl.c.orig
+++ b/src/lib/crypt_ops/crypto_rsa_openssl.c
@@ -47,7 +47,7 @@ struct crypto_pk_t
int
crypto_pk_key_is_private(const crypto_pk_t *k)
{
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
if (!k || !k->key)
return 0;
@@ -212,7 +212,7 @@ crypto_pk_public_exponent_ok(const crypto_pk_t *env)
const BIGNUM *e;
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
const BIGNUM *n, *d;
RSA_get0_key(env->key, &n, &e, &d);
#else
@@ -242,7 +242,7 @@ crypto_pk_cmp_keys(const crypto_pk_t *a, const crypto_
const BIGNUM *a_n, *a_e;
const BIGNUM *b_n, *b_e;
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
const BIGNUM *a_d, *b_d;
RSA_get0_key(a->key, &a_n, &a_e, &a_d);
RSA_get0_key(b->key, &b_n, &b_e, &b_d);
@@ -279,7 +279,7 @@ crypto_pk_num_bits(crypto_pk_t *env)
tor_assert(env);
tor_assert(env->key);
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
/* It's so stupid that there's no other way to check that n is valid
* before calling RSA_bits().
*/
@@ -572,7 +572,7 @@ static bool
rsa_private_key_too_long(RSA *rsa, int max_bits)
{
const BIGNUM *n, *e, *p, *q, *d, *dmp1, *dmq1, *iqmp;
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,1)
n = RSA_get0_n(rsa);

22
package/tor/0003-patch-src_lib_tls_x509_openssl_c.patch
View File

@ -1,22 +0,0 @@
Fix build with opaque structs in LibreSSL 3.5
Downloaded from OpenBSD ports:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tor/patches/patch-src_lib_tls_x509_openssl_c?rev=1.2&content-type=text/x-cvsweb-markup
Patch series was sent upstream:
https://forum.torproject.net/t/tor-relays-openbsd-stable-net-tor-and-0-4-7-7/3244
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Index: src/lib/tls/x509_openssl.c
--- a/src/lib/tls/x509_openssl.c.orig
+++ b/src/lib/tls/x509_openssl.c
@@ -329,7 +329,7 @@ tor_tls_cert_is_valid(int severity,
cert_key = X509_get_pubkey(cert->cert);
if (check_rsa_1024 && cert_key) {
RSA *rsa = EVP_PKEY_get1_RSA(cert_key);
-#ifdef OPENSSL_1_1_API
+#if defined(OPENSSL_1_1_API) || defined(LIBRESSL_VERSION_NUMBER)
if (rsa && RSA_bits(rsa) == 1024) {
#else
if (rsa && BN_num_bits(rsa->n) == 1024) {

4
package/tor/tor.hash
View File

@ -1,4 +1,4 @@
# From https://dist.torproject.org/tor-0.4.7.14.tar.gz.sha256sum
sha256 a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8 tor-0.4.7.14.tar.gz
# From https://dist.torproject.org/tor-0.4.8.4.tar.gz.sha256sum
sha256 09c1ce74a25fc3b48c81ff146cbd0dd538cbbb8fe4e2964fc2fb2b192f6a1d2b tor-0.4.8.4.tar.gz
# Locally computed
sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE

2
package/tor/tor.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
TOR_VERSION = 0.4.7.14
TOR_VERSION = 0.4.8.4
TOR_SITE = https://dist.torproject.org
TOR_LICENSE = BSD-3-Clause
TOR_LICENSE_FILES = LICENSE