From c989e3c41305f2d7024dbf663915a3967b3910e7 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:05:24 +0100 Subject: [PATCH 1/3] Rework trustless manager --- .../crypto/TrustlessSSLSocketFactory.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/qortal/crypto/TrustlessSSLSocketFactory.java b/src/main/java/org/qortal/crypto/TrustlessSSLSocketFactory.java index f14efae8..3643e552 100644 --- a/src/main/java/org/qortal/crypto/TrustlessSSLSocketFactory.java +++ b/src/main/java/org/qortal/crypto/TrustlessSSLSocketFactory.java @@ -1,33 +1,33 @@ package org.qortal.crypto; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; +import javax.net.ssl.*; import java.security.cert.X509Certificate; public abstract class TrustlessSSLSocketFactory { - // Create a trust manager that does not validate certificate chains + /** + * Creates a SSLSocketFactory that ignore certificate chain validation because ElectrumX servers use mostly + * self signed certificates. + */ private static final TrustManager[] TRUSTLESS_MANAGER = new TrustManager[] { new X509TrustManager() { - public java.security.cert.X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; + public X509Certificate[] getAcceptedIssuers() { + return null; } - - public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) { + public void checkClientTrusted(X509Certificate[] certs, String authType) { } - - public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) { + public void checkServerTrusted(X509Certificate[] certs, String authType) { } } }; - // Install the all-trusting trust manager + /** + * Install the all-trusting trust manager. + */ private static final SSLContext sc; static { try { - sc = SSLContext.getInstance("TLSv1.3"); + sc = SSLContext.getInstance("SSL"); sc.init(null, TRUSTLESS_MANAGER, new java.security.SecureRandom()); } catch (Exception e) { throw new RuntimeException(e); @@ -37,5 +37,4 @@ public abstract class TrustlessSSLSocketFactory { public static SSLSocketFactory getSocketFactory() { return sc.getSocketFactory(); } - } From 79b674d2f2693c3b769efd3d4cf2ec9fdf406802 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:25:18 +0100 Subject: [PATCH 2/3] Update AT metadata --- lib/org/ciyam/AT/maven-metadata-local.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/org/ciyam/AT/maven-metadata-local.xml b/lib/org/ciyam/AT/maven-metadata-local.xml index d8f3dd34..355c973f 100644 --- a/lib/org/ciyam/AT/maven-metadata-local.xml +++ b/lib/org/ciyam/AT/maven-metadata-local.xml @@ -5,14 +5,11 @@ 1.4.1 - 1.3.4 - 1.3.5 - 1.3.6 1.3.7 1.3.8 1.4.0 1.4.1 - 20230821074325 + 20231212092227 From bf8005aa5a010a1f2fddf2a3e8391f9963416057 Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Tue, 12 Dec 2023 10:26:30 +0100 Subject: [PATCH 3/3] Update AT --- lib/org/ciyam/AT/1.4.1/AT-1.4.1.jar | Bin 161850 -> 161856 bytes lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom | 17 ++++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/org/ciyam/AT/1.4.1/AT-1.4.1.jar b/lib/org/ciyam/AT/1.4.1/AT-1.4.1.jar index 05c548c8b59e0ca4254cb43fe5f809fe80a0c83e..20e773a4588153466ae87dd8fea4a3f16d37a371 100644 GIT binary patch delta 8354 zcmZu$30#fY`@iR0ZAzsTX-}JoED=()N}DN__NT|i8R-^GnSM+ zQc`0XO&a_dTO}jgsQ>ex^Opae#^=+g-R3KO1OkCC{Adu}nOHl|#!@+1X^#9g3(xx6Z^qmiCz}^z zB)k9%PwCTN_eOBP@{zd^07N5^CH)yoeyA2F90Y@agDcg>tj7XDg{Z>H zND{Fc5ljW_T$O~}K$5uwrOMDzm<>9G=%UQWrOkD)s0|hwii>Jm=^DwTYiRrcy83~^ zJ~nl17?KexbBcU&Jg2-83IvvN1Qj9!iRWP4%`_Z;g7(spcxPD@TlP=}Ph~v9o$j&0 zw7H{raXWmLX?Zw&Jmb?@_`{`W;N#EnksJ?28F(-$R zi4?4B`Qc&IQ?CBVn^Kg_wZ<-`nSxLEpKCYJBb=9OeJ$4A%DhK4xs@I{zqN>53{tiR^|&OAvy65F%}Xp zO}vb)XzxMtbj7Km=m?`>9UsBIE%ib7SfKUfA$_QCy#7Kzu~CvN+RuDb+8%mi0{G?_ zF;qaqB?^Yfg^Gx`6}B+a^)@%<=yG{myq|5&sn*|LebpCsv3^K5Q(CQrav1FOBeK(E z0XCDm{G~P?!d$-f)%?V!0RlmXJl$)=dkL18xNJr(EbPTfvP^qI>^TOMbvs$C3#uAP zi3eoZmnLM*Xc>gFT_KX&@i(Qnu^G*0Yo1%C|F96&B+?>~HGMf_ci#%9v$YR>gPA^y zfqZhQ*rMkHXufX$X7XP}MgoD|Y!OiAM5?kLZH=^63)OKmn8KOHLnTX43YZ;d1 z9u{0lnZ+_>h1E~)Mj7PeNkDbGMbZY?3{8?R--jlOY$V_5Xh#VR4`DrqXtN{2= z7KS a}mFfF;iqxUT5s}J&9ugFf!QhsL; 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 D8A>g9 diff --git a/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom b/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom index 16f644b9..d88a53e2 100644 --- a/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom +++ b/lib/org/ciyam/AT/1.4.1/AT-1.4.1.pom @@ -10,14 +10,13 @@ UTF-8 false - - 3.8.1 - 3.2.0 - 3.3.1 - 3.0.0-M4 - 3.2.0 - - 1.64 + 1.69 + 4.13.2 + 3.11.0 + 3.3.0 + 3.6.3 + 3.3.0 + 3.2.2 @@ -117,7 +116,7 @@ junit junit - 4.13 + ${junit.version} test