Commit a7223cf2 authored by zeroleak's avatar zeroleak
Browse files

Tor 0.2.9 compatibility

parent 5443d152
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.samourai.code.whirlpool</groupId> <groupId>io.samourai.code.whirlpool</groupId>
<artifactId>whirlpool-client-cli</artifactId> <artifactId>whirlpool-client-cli</artifactId>
<version>0.10.9</version> <version>develop-SNAPSHOT</version>
<name>whirlpool-client-cli</name> <name>whirlpool-client-cli</name>
<properties> <properties>
<spring-boot.version>2.1.6.RELEASE</spring-boot.version> <spring-boot.version>2.1.6.RELEASE</spring-boot.version>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>io.samourai.code.whirlpool</groupId> <groupId>io.samourai.code.whirlpool</groupId>
<artifactId>whirlpool-client</artifactId> <artifactId>whirlpool-client</artifactId>
<version>0.23.23</version> <version>develop-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -218,7 +218,8 @@ public final class TorConfigBuilder { ...@@ -218,7 +218,8 @@ public final class TorConfigBuilder {
return this; return this;
} }
public TorConfigBuilder httpTunnelPort(int port, String isolationFlags) { // disable HTTPTunnelPort for Tor 0.2.9 compatibility
/*public TorConfigBuilder httpTunnelPort(int port, String isolationFlags) {
buffer.append("HTTPTunnelPort ").append(port); buffer.append("HTTPTunnelPort ").append(port);
if (!isNullOrEmpty(isolationFlags)) { if (!isNullOrEmpty(isolationFlags)) {
buffer.append(" ").append(isolationFlags); buffer.append(" ").append(isolationFlags);
...@@ -232,7 +233,7 @@ public final class TorConfigBuilder { ...@@ -232,7 +233,7 @@ public final class TorConfigBuilder {
return httpTunnelPort( return httpTunnelPort(
settings.getHttpTunnelPort(), settings.getHttpTunnelPort(),
settings.hasIsolationAddressFlagForTunnel() ? "IsolateDestAddr" : null); settings.hasIsolationAddressFlagForTunnel() ? "IsolateDestAddr" : null);
} }*/
public TorConfigBuilder line(String value) { public TorConfigBuilder line(String value) {
if (!isNullOrEmpty(value)) buffer.append(value).append("\n"); if (!isNullOrEmpty(value)) buffer.append(value).append("\n");
...@@ -360,7 +361,8 @@ public final class TorConfigBuilder { ...@@ -360,7 +361,8 @@ public final class TorConfigBuilder {
: this; : this;
} }
public TorConfigBuilder reducedConnectionPadding() { // disable ReducedConnectionPadding for Tor 0.2.9 compatibility
/*public TorConfigBuilder reducedConnectionPadding() {
buffer.append("ReducedConnectionPadding 1").append('\n'); buffer.append("ReducedConnectionPadding 1").append('\n');
return this; return this;
} }
...@@ -368,7 +370,7 @@ public final class TorConfigBuilder { ...@@ -368,7 +370,7 @@ public final class TorConfigBuilder {
@SettingsConfig @SettingsConfig
public TorConfigBuilder reducedConnectionPaddingFromSettings() { public TorConfigBuilder reducedConnectionPaddingFromSettings() {
return settings.hasReducedConnectionPadding() ? reducedConnectionPadding() : this; return settings.hasReducedConnectionPadding() ? reducedConnectionPadding() : this;
} }*/
public void reset() { public void reset() {
buffer = new StringBuffer(); buffer = new StringBuffer();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment