From 5d8d4fbbcb5c5de9370711c19bb3510210989a98 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Sat, 20 Feb 2021 16:02:15 -0800 Subject: treewide: Run refresh on all packages The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy --- .../patches/0001-OpenSSL-1.1.0-compile-fix.patch | 16 +++++++--------- net/chaosvpn/patches/010-openssl-deprecated.patch | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'net/chaosvpn/patches') diff --git a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch index 44a644dd9..38acd1cac 100644 --- a/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch +++ b/net/chaosvpn/patches/0001-OpenSSL-1.1.0-compile-fix.patch @@ -7,8 +7,6 @@ Subject: [PATCH] OpenSSL 1.1.0 compile fix. crypto.c | 53 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 18 deletions(-) -diff --git a/crypto.c b/crypto.c -index e476611..e8b72d3 100644 --- a/crypto.c +++ b/crypto.c @@ -46,6 +46,10 @@ openssl dgst \ @@ -22,7 +20,7 @@ index e476611..e8b72d3 100644 EVP_PKEY * crypto_load_key(const char *key, const bool is_private) { -@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -80,7 +84,7 @@ crypto_rsa_verify_signature(struct strin { int err; bool retval; @@ -31,7 +29,7 @@ index e476611..e8b72d3 100644 EVP_PKEY *pkey; /* load public key into openssl structure */ -@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -89,15 +93,22 @@ crypto_rsa_verify_signature(struct strin log_err("crypto_verify_signature: key loading failed\n"); return false; } @@ -58,7 +56,7 @@ index e476611..e8b72d3 100644 EVP_PKEY_free(pkey); if (err != 1) { -@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct string *databuffer, struct string *signature, +@@ -110,7 +121,7 @@ crypto_rsa_verify_signature(struct strin retval = true; bailout_ctx_cleanup: @@ -67,7 +65,7 @@ index e476611..e8b72d3 100644 //log_info("Signature Verified Ok.\n"); return retval; -@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *ciphertext, const char *privkey, struct string +@@ -146,7 +157,7 @@ crypto_rsa_decrypt(struct string *cipher len = RSA_private_decrypt(string_length(ciphertext), (unsigned char*)string_get(ciphertext), (unsigned char*)string_get(decrypted), @@ -118,7 +116,7 @@ index e476611..e8b72d3 100644 goto bail_out; } -@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -201,7 +217,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -127,7 +125,7 @@ index e476611..e8b72d3 100644 &decryptdone, (unsigned char*)string_get(ciphertext), string_length(ciphertext))) { /* TODO: need cleaner way: */ -@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -212,7 +228,7 @@ crypto_aes_decrypt(struct string *cipher goto bail_out; } @@ -136,7 +134,7 @@ index e476611..e8b72d3 100644 (unsigned char*)string_get(decrypted)+string_length(decrypted), &decryptdone)) { /* TODO: need cleaner way: */ -@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *ciphertext, struct string *aes_key, struct str +@@ -226,7 +242,8 @@ crypto_aes_decrypt(struct string *cipher retval = true; bail_out: diff --git a/net/chaosvpn/patches/010-openssl-deprecated.patch b/net/chaosvpn/patches/010-openssl-deprecated.patch index 4690f92cf..5d1ebf444 100644 --- a/net/chaosvpn/patches/010-openssl-deprecated.patch +++ b/net/chaosvpn/patches/010-openssl-deprecated.patch @@ -32,7 +32,7 @@ } void -@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void) +@@ -268,10 +278,10 @@ crypto_warn_openssl_version_changed(void * OpenSSL library used. * Output a warning if not. */ -- cgit v1.2.3