<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32e8c32babd4f9f1d72a118e78dac33bb9cd2848">https://github.com/macports/macports-ports/commit/32e8c32babd4f9f1d72a118e78dac33bb9cd2848</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 32e8c32babd privoxy: Update to version 4.0.0
</span>32e8c32babd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32e8c32babd4f9f1d72a118e78dac33bb9cd2848
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Jan 25 09:02:09 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> privoxy: Update to version 4.0.0
</span>---
www/privoxy/Portfile | 32 ++++++++-----
www/privoxy/files/patch-config.diff | 13 +++--
www/privoxy/files/patch-match-all.action.diff | 63 +++++++++++++++++++++----
www/privoxy/files/patch-openssl.c.diff | 68 ++++++---------------------
www/privoxy/files/patch-ssl_common.h.diff | 15 +++---
5 files changed, 103 insertions(+), 88 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/Portfile b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4e7e264c31..1234f0b3bb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name privoxy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories www security net
license GPL-2
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,9 +67,9 @@ if {${name} eq ${subport}} {
</span> extract.only ${distname}${extract.suffix}
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8ca1e475c112bfad1e8d556b12e5a6b51a122c47 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e6ccbca1656f4e616b4657f8514e33a70f6697e9d7294356577839322a3c5d2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1589785
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 675fc82e27446ebc881693269d41c9af60d3a14c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c08e2ba0049307017bf9d8a63dd2a0dfb96aa0cdeb34ae007776e63eba62a26f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1746840
</span>
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,10 +113,20 @@ if {${name} eq ${subport}} {
</span> ## sudo cp ./privoxy-orig/config ./privoxy-new/
## sudo cp ./privoxy-orig/match-all.action ./privoxy-new/
## sudo chown `whoami` privoxy-orig/config privoxy-new/config privoxy-orig/match-all.action privoxy-new/match-all.action
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ## patch -p0 -f -l -N privoxy-new/config < ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/privoxy/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## patch -p0 -f -l -N privoxy-new/match-all.action < ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## diff -NaurdwB ./privoxy-orig/config ./privoxy-new/config | sed -E -e 's/\.\/privoxy-(orig|new)\/(config)(\.[[:alnum:]]+)*/\.\/\2/' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-config.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## diff -NaurdwB ./privoxy-orig/match-all.action ./privoxy-new/match-all.action | sed -E -e 's/\.\/privoxy-(orig|new)\/(match-all\.action)(\.[[:alnum:]]+)*/\.\/\2/' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## patch -p0 -f -l -N privoxy-new/config < "$(dirname $(port file privoxy))/files/patch-config.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## patch -p0 -f -l -N privoxy-new/match-all.action < "$(dirname $(port file privoxy))/files/patch-match-all.action.diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## diff -NaurdwB ./privoxy-orig/config ./privoxy-new/config | sed -E -e 's/\.\/privoxy-(orig|new)/\./g' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## diff -NaurdwB ./privoxy-orig/match-all.action ./privoxy-new/match-all.action | sed -E -e 's/\.\/privoxy-(orig|new)/\./g' | sed -E -e 's|/opt/local|@@PREFIX@@|g' > ~/Downloads/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bash commands to patch existing configuration files from new upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## sudo cp ${prefix}/etc/privoxy/config.new privoxy-orig/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## sudo cp ${prefix}/etc/privoxy/config privoxy-new/config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## diff -NaurdwB -I '^#[[:space:]]*' ./privoxy-orig/config ./privoxy-new/config | sed -E -e 's/\.\/privoxy-(orig|new)/\./g' > ~/Downloads/patch-my-config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## patch -p0 -f -l -N -b privoxy-orig/config < ~/Downloads/patch-my-config.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## sudo cp ${prefix}/etc/privoxy/match-all.action.new privoxy-orig/match-all.action
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## sudo cp ${prefix}/etc/privoxy/match-all.action privoxy-new/match-all.action
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## diff -NaurdwB -I '^#[[:space:]]*' ./privoxy-orig/match-all.action ./privoxy-new/match-all.action | sed -E -e 's/\.\/privoxy-(orig|new)/\./g' > ~/Downloads/patch-my-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## patch -p0 -f -l -N -b privoxy-orig/match-all.action < ~/Downloads/patch-my-match-all.action.diff
</span>
patchfiles-append \
patch-config.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -498,7 +508,7 @@ TLS_PRIVOXY_ROOT_CA
</span> variant ecc \
requires https_inspection \
description {Use Elliptic Curve Keys for HTTPS Inspection.} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # diff -NaurdwB ./privoxy-orig/openssl.c ./privoxy-new/openssl.c | sed -E -e 's/\.\/privoxy-(orig|new)\//\.\//' > ~/Downloads/patch-openssl.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # diff -NaurdwB ./privoxy-orig/openssl.c ./privoxy-new/openssl.c | sed -E -e 's/\.\/privoxy-(orig|new)/\./g' > ~/Downloads/patch-openssl.c.diff
</span> # diff -NaurdwB ./privoxy-orig/ssl_common.h ./privoxy-new/ssl_common.h | sed -E -e 's/\.\/privoxy-(orig|new)\//\.\//' > ~/Downloads/patch-ssl_common.h.diff
patchfiles-append \
patch-openssl.c.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -568,7 +578,7 @@ TLS_PRIVOXY_ROOT_CA
</span>
subport ${name}-pki-bundle {
# Please increase the revision whenever curl-ca-bundle contents change
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
license MIT
supported_archs noarch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/patch-config.diff b/www/privoxy/files/patch-config.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d8c49ab4bc3..e2b56cda22a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/patch-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./config 2021-10-03 11:03:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./config 2021-11-03 18:57:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1704,7 +1704,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./config 2025-01-25 08:51:46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./config 2025-01-25 08:54:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1712,6 +1712,7 @@
</span> # keep-alive-timeout 300
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>--keep-alive-timeout 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keep-alive-timeout 5
</span> +#keep-alive-timeout 5
#
# 6.5. tolerate-pipelining
# =========================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2466,9 +2466,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2481,9 +2482,9 @@
</span> #
# Example:
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +20,7 @@
</span> #
# 7.2. ca-cert-file
# ==================
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2625,9 +2625,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2648,9 +2649,9 @@
</span> # +-----------------------------------------------------+
# Example:
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/patch-match-all.action.diff b/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 96155420d81..eec8f23e767 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/patch-match-all.action.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./match-all.action 2021-12-17 08:07:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./match-all.action 2021-12-17 08:01:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,192 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./match-all.action 2025-01-25 08:11:07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./match-all.action 2025-01-25 08:27:59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,12 +5,239 @@
</span> # users should only edit this file through the actions file editor.
#
#############################################################################
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> +# See http://www.christianschenk.org/blog/enhancing-your-privacy-using-squid-and-privoxy/
+#{ \
+#+hide-referrer{conditional-forge} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#+hide-user-agent{Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.2 Safari/605.1.15} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#+hide-user-agent{Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15} \
</span> +#}
+#/ # Match all URLs
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,13 @@
</span> +# of important connections (e.g. Apple domains on macOS and iOS devices),
+# fix websites broken by HTTPS inspection or Privoxy rules, or any other reason
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# TLDs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{-https-inspection}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.edu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.vaccines.gov
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.gov
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +# Amazon domains
+{-https-inspection}
+.amazon.com
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +72,12 @@
</span> +{-https-inspection}
+.tomtom.com
+.split.io
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.strava.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++api2.branch.io
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Akamai edge domains (used by Apple)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{-https-inspection}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.akamaiedge.net
</span> +
+# Apple domains
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,20 +95,32 @@
</span> +
+# Charitible and Volunteering domains
+# {-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++# .ngpvan.com
</span> +
+# Cloud domains (various)
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.adobe.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.adobesign.com
</span> +.dropbox.com
+.duckduckgo.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.adobesign.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mozilla.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.mozilla.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++soundcloud.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.soundcloud.com
</span> +.login.yahoo.com
+
+# e-Commerce domains
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.airbnb.com
</span> +.ebay.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.lyft.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.moma.org
</span> +.paypal.com
+.redfin.com
+.cdn-redfin.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.target.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.ups.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.venmo.com
</span> +
+# Educational domains
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,8 +161,10 @@
</span> +
+# ISP and Mobile and Mobile App domains
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.att.com
</span> +.pabs.comcast.com
+.cloudtv.comcast.net
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.vzw.com
</span> +.xfinity.com
+
+# Mailing List domains
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,9 +174,16 @@
</span> +{-https-inspection}
+img.buzzfeed.com
+pixiedust.buzzfeed.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+.epg.geniatech.com
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+services.geniatech.eu
</span> +cdn.jwplayer.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>++substack.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++substackcdn.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.substack.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.substackcdn.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++accounts.theatlantic.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cdn.theatlantic.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++data-cdn.theatlantic.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++support.theatlantic.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++therenewalawards.theatlantic.com
</span> +.usabilla.com
+
+# Microsoft domains
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,9 +219,19 @@
</span> +.s1gov.net
+.verisign.net
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Twitter domains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Microblogging domains
</span> +{-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++bsky.social
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.bsky.social
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bsky.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.bsky.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++mastodon.social
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.mastodon.social
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.redditmedia.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.redditstatic.com
</span> +.twimg.com
<span style='display:block; white-space:pre;background:#e0ffe0;'>++.twitter.com
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.x.com
</span> +
+# Zoom domains
+{-https-inspection}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,3 +240,6 @@
</span> +
+# Personal domains
+# {-https-inspection}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Work domains
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# {-https-inspection}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/patch-openssl.c.diff b/www/privoxy/files/patch-openssl.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e86986133c3..dd2667cf56f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/patch-openssl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/patch-openssl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./openssl.c 2021-12-09 10:02:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./openssl.c 2021-12-09 10:23:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1484,8 +1484,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int ret = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* key_file_path;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BIGNUM *exp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSA *rsa;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* #ifndef USE_EVP_PKEY_EC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EVP_PKEY *key;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key_file_path = make_certs_path(csp->config->certificate_directory,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1504,6 +1507,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exp = BN_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsa = RSA_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- key = EVP_PKEY_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1536,7 +1540,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ret = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./openssl.c 2025-01-25 05:54:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./openssl.c 2025-01-25 10:15:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1537,10 +1537,18 @@
</span> goto exit;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key = EVP_RSA_gen(RSA_KEYSIZE);
</span> +#else /* #ifndef USE_EVP_PKEY_EC */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * https://www.openssl.org/docs/manmaster/man7/EVP_PKEY-EC.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span> + key = EVP_EC_gen(EC_GROUP_NAME);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (key == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log_ssl_errors(LOG_LEVEL_ERROR, "EC key generation error");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ret = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ goto exit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Exporting private key into file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1552,6 +1567,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Freeing used variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (exp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* #ifndef USE_EVP_PKEY_EC */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (key == NULL)
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- BN_free(exp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1560,6 +1576,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RSA_free(rsa);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log_error(LOG_LEVEL_ERROR, "EVP_RSA_gen() failed");
</span> +#else /* #ifndef USE_EVP_PKEY_EC */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (key)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EVP_PKEY_free(key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log_error(LOG_LEVEL_ERROR, "EVP_EC_gen() failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* #ifndef USE_EVP_PKEY_EC */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret = -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto exit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/files/patch-ssl_common.h.diff b/www/privoxy/files/patch-ssl_common.h.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ddd584d574..87699859e17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/files/patch-ssl_common.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/files/patch-ssl_common.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./ssl_common.h 2021-11-20 08:43:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./ssl_common.h 2021-11-20 08:48:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,8 +32,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./ssl_common.h 2025-01-25 10:23:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./ssl_common.h 2025-01-25 10:25:19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,21 @@
</span>
#include "project.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,16 +12,13 @@
</span> +/*
+ * Use EVP_PKEY_RSA by default
+ */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef USE_EVP_PKEY_EC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RSA_KEY_PUBLIC_EXPONENT 65537 /* Public exponent for RSA private key generating */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define RSA_KEYSIZE 2048 /* Size of generated RSA keys */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef USE_EVP_PKEY_EC
</span> +/*
+ * See <openssl/obj_mac.h>
+ */
+#define EC_GROUP_NAME SN_X9_62_prime256v1 /* EC group name */
+#endif
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSA_KEY_PUBLIC_EXPONENT 65537 /* Public exponent for RSA private key generating */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define RSA_KEYSIZE 2048 /* Size of generated RSA keys */
</span> #define ERROR_BUF_SIZE 1024 /* Size of buffer for error messages */
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define INVALID_CERT_INFO_BUF_SIZE 2048 /* Size of buffer for message with information about reason of certificate invalidity. Data after the end of buffer will not be saved */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define KEY_FILE_TYPE ".pem"
</span></pre><pre style='margin:0'>
</pre>