From 82eeb66df61c76718735ca0cfffc61aeec4b29b9 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 19 Dec 2023 08:47:44 +0100 Subject: [PATCH 1/8] Fix #86: Set develop version to 1.7.0-SNAPSHOT --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7b6ffb3..57323bb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.wultra ssl-pinning-tool - 1.6.0 + 1.7.0-SNAPSHOT jar org.springframework.boot @@ -26,7 +26,6 @@ https://wultra.com/ - Apache 2.0 From 4ad518d8224430288dca95f976e1af1e9f5f3df2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 07:50:53 +0000 Subject: [PATCH 2/8] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.1.5 to 3.2.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.5...v3.2.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b6ffb3..1d35c5d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.6 + 3.2.0 From 4f0f67be1f872bcd843fc274a72d67fbb951ca85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 18:46:33 +0000 Subject: [PATCH 3/8] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.0...v3.2.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index addd6cb..2767458 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0 + 3.2.1 From d876207e75856d5ed78e04725265010080f3e485 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Tue, 2 Jan 2024 07:55:18 +0100 Subject: [PATCH 4/8] Fix #89: Prefer Java 8 APIs over Guava --- .../wultra/security/ssl/pinning/SSLPinningTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/wultra/security/ssl/pinning/SSLPinningTest.java b/src/test/java/com/wultra/security/ssl/pinning/SSLPinningTest.java index 67ca60a..94f606f 100644 --- a/src/test/java/com/wultra/security/ssl/pinning/SSLPinningTest.java +++ b/src/test/java/com/wultra/security/ssl/pinning/SSLPinningTest.java @@ -1,6 +1,5 @@ package com.wultra.security.ssl.pinning; -import com.google.common.io.BaseEncoding; import com.wultra.security.ssl.pinning.errorhandling.SSLPinningException; import com.wultra.security.ssl.pinning.model.CertificateInfo; import io.getlime.security.powerauth.crypto.lib.util.SignatureUtils; @@ -12,6 +11,7 @@ import java.io.FileWriter; import java.security.PublicKey; import java.security.Security; +import java.util.Base64; import java.util.Scanner; import static org.junit.jupiter.api.Assertions.*; @@ -55,7 +55,7 @@ void testGenerateKeyPairInvalidPassword() { void testSignatureWithDetails() throws Exception { CertificateInfo certInfo = app.sign(keyPairFile.getAbsolutePath(), PRIVATE_KEY_PASSWORD, "www.google.com", "9eed43381cf7d58e4563a951364255fc776707a043542a7b997d27c646ee6fb6", 1540280280L); - byte[] signature = BaseEncoding.base64().decode(certInfo.getSignature()); + byte[] signature = Base64.getDecoder().decode(certInfo.getSignature()); PublicKey publicKey = app.exportPublicKey(keyPairFile.getAbsolutePath(), PRIVATE_KEY_PASSWORD); String payload = "www.google.com&nu1DOBz31Y5FY6lRNkJV/HdnB6BDVCp7mX0nxkbub7Y=&1540280280"; final SignatureUtils utils = new SignatureUtils(); @@ -69,7 +69,7 @@ void testSignatureWithCertInfo() throws Exception { certInfoIn.setExpires(1540280280L); certInfoIn.setFingerprint("9eed43381cf7d58e4563a951364255fc776707a043542a7b997d27c646ee6fb6"); CertificateInfo certInfo = app.sign(keyPairFile.getAbsolutePath(), PRIVATE_KEY_PASSWORD, certInfoIn); - byte[] signature = BaseEncoding.base64().decode(certInfo.getSignature()); + byte[] signature = Base64.getDecoder().decode(certInfo.getSignature()); PublicKey publicKey = app.exportPublicKey(keyPairFile.getAbsolutePath(), PRIVATE_KEY_PASSWORD); String payload = "www.google.com&nu1DOBz31Y5FY6lRNkJV/HdnB6BDVCp7mX0nxkbub7Y=&1540280280"; final SignatureUtils utils = new SignatureUtils(); @@ -80,7 +80,7 @@ void testSignatureWithCertInfo() throws Exception { void testReadCertificate() throws Exception { File cerFile = File.createTempFile("ssl_pinning", ".cer"); FileWriter fw = new FileWriter(cerFile.getAbsolutePath()); - fw.write(new String(BaseEncoding.base64().decode(TEST_CERTIFICATE_BASE64))); + fw.write(new String(Base64.getDecoder().decode(TEST_CERTIFICATE_BASE64))); fw.close(); CertificateInfo certInfo = app.readCertificateInfo(cerFile.getAbsolutePath()); assertEquals("www.google.com", certInfo.getName()); @@ -94,7 +94,7 @@ void testGenerateJsonFile() throws Exception { File jsonFile = File.createTempFile("ssl_pinning", ".json"); File cerFile = File.createTempFile("ssl_pinning", ".cer"); FileWriter fw = new FileWriter(cerFile.getAbsolutePath()); - fw.write(new String(BaseEncoding.base64().decode(TEST_CERTIFICATE_BASE64))); + fw.write(new String(Base64.getDecoder().decode(TEST_CERTIFICATE_BASE64))); fw.close(); CertificateInfo certInfoIn = app.readCertificateInfo(cerFile.getAbsolutePath()); CertificateInfo certInfo = app.sign(keyPairFile.getAbsolutePath(), PRIVATE_KEY_PASSWORD, certInfoIn); From 454936001599af2bc8cdca3064d41ebf6cf258ae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 18:10:04 +0000 Subject: [PATCH 5/8] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.1...v3.2.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2767458..cfa19af 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.1 + 3.2.2 From 4e06d0de26a476b70f54c42f7b4516168a865113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 06:01:35 +0000 Subject: [PATCH 6/8] Bump org.springframework.boot:spring-boot-starter-parent Bumps [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.2...v3.2.3) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-parent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cfa19af..aa3797b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 3.2.3 From 53b3ed633645a11d279dce92797c049c6a4d1ed3 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Fri, 23 Feb 2024 08:40:04 +0100 Subject: [PATCH 7/8] Fix #93: Update Wultra dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa3797b..b047859 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.77 - 1.6.0 + 1.7.0 From 3c2a250c009e984f3682ee3acbd593d5f2fa7f32 Mon Sep 17 00:00:00 2001 From: Lubos Racansky Date: Fri, 23 Feb 2024 08:42:04 +0100 Subject: [PATCH 8/8] Fix #94: Set release version to 1.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa3797b..3594d4d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.wultra ssl-pinning-tool - 1.7.0-SNAPSHOT + 1.7.0 jar org.springframework.boot