Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dnscrypt-proxy binaries as well as resolvers and relays #577

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+31 −9
Open

Update dnscrypt-proxy binaries as well as resolvers and relays #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1a08b2
Update .NET framework version
Dola-Shuvi Oct 27, 2024
253ca6f
Update resolver and relay list to latest version
Dola-Shuvi Oct 27, 2024
f980406
Update dnscrypt-proxy binaries
Dola-Shuvi Oct 27, 2024
4b85577
Update version and apply proper patches
Dola-Shuvi Oct 27, 2024
4af8b7f
Update Newtonsoft.Json due to security vulnerability
Dola-Shuvi Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified SimpleDnsCrypt/DNSx64/dnscrypt-proxy.exe
View file
Open in desktop
Binary file not shown.
Binary file modified SimpleDnsCrypt/DNSx86/dnscrypt-proxy.exe
View file
Open in desktop
Binary file not shown.
21 changes: 21 additions & 0 deletions SimpleDnsCrypt/Helper/PatchHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,27 @@ public static bool Patch()

return DnscryptProxyConfigurationManager.SaveConfiguration();
}
if(version.Equals("0.7.3"))
{
//update relays and resolvers
var sources = DnscryptProxyConfigurationManager.DnscryptProxyConfiguration.sources;
if (sources.ContainsKey("relays"))
{
if(sources["relays"].urls[0].Contains("/v2/") && sources["relays"].urls[1].Contains("/v2/"))
{
sources["relays"].urls = new[] { "https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v3/relays.md", "https://download.dnscrypt.info/resolvers-list/v3/relays.md" };
}
}
if (sources.ContainsKey("public-resolvers"))
{
if (sources["public-resolvers"].urls[0].Contains("/v2/") && sources["public-resolvers"].urls[1].Contains("/v2/"))
{
sources["public-resolvers"].urls = new[] { "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md", "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" };
}
}

return DnscryptProxyConfigurationManager.SaveConfiguration();
}

return false;
}
Expand Down
4 changes: 2 additions & 2 deletions SimpleDnsCrypt/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
ResourceDictionaryLocation.None,
ResourceDictionaryLocation.SourceAssembly
)]
[assembly: AssemblyVersion("0.7.2")]
[assembly: AssemblyFileVersion("0.7.2")]
[assembly: AssemblyVersion("0.7.3")]
[assembly: AssemblyFileVersion("0.7.3")]
2 changes: 1 addition & 1 deletion SimpleDnsCrypt/SimpleDnsCrypt.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
<Version>0.15.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
<Version>13.0.3</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.7.0</Version>
Expand Down
4 changes: 2 additions & 2 deletions SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-proxy.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ skip_incompatible = false
[sources]

[sources.'public-resolvers']
urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
cache_file = 'public-resolvers.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
prefix = ''

[sources.'relays']
urls = ['https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/relays.md', 'https://download.dnscrypt.info/resolvers-list/v2/relays.md']
urls = ['https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v3/relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/relays.md']
cache_file = 'relays.md'
minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
refresh_delay = 72
Expand Down
6 changes: 3 additions & 3 deletions Uninstall/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup>
</configuration>
</configuration>
3 changes: 2 additions & 1 deletion Uninstall/Uninstall.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
<OutputType>Exe</OutputType>
<RootNamespace>Uninstall</RootNamespace>
<AssemblyName>Uninstall</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down