aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-10-02 07:30:29 +1000
committerGitHub <noreply@github.com>2024-10-01 23:30:29 +0200
commitf7a51f5ec5e992c53cd6ef7bc2ece482ead848f0 (patch)
tree95a783f2e23baf1648a5a7adb6a11f23c7d807f3
parentbdbac0dfde77e87891e3078aa4a672d6404a1fc3 (diff)
downloadskyhanni-f7a51f5ec5e992c53cd6ef7bc2ece482ead848f0.tar.gz
skyhanni-f7a51f5ec5e992c53cd6ef7bc2ece482ead848f0.tar.bz2
skyhanni-f7a51f5ec5e992c53cd6ef7bc2ece482ead848f0.zip
Backend: Rename keystore file to specify it is for skyhanni (#2619)
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt2
-rw-r--r--src/main/resources/skyhanni-keystore.jks (renamed from src/main/resources/mykeystore.jks)bin124141 -> 124141 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
index d28263af6..f331ab3e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
@@ -30,7 +30,7 @@ object APIUtils {
private val ctx: SSLContext? = run {
try {
val myKeyStore = KeyStore.getInstance("JKS")
- myKeyStore.load(APIUtils.javaClass.getResourceAsStream("/keystore.jks"), "changeit".toCharArray())
+ myKeyStore.load(APIUtils.javaClass.getResourceAsStream("/skyhanni-keystore.jks"), "changeit".toCharArray())
val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm())
val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
kmf.init(myKeyStore, null)
diff --git a/src/main/resources/mykeystore.jks b/src/main/resources/skyhanni-keystore.jks
index 75039b79a..75039b79a 100644
--- a/src/main/resources/mykeystore.jks
+++ b/src/main/resources/skyhanni-keystore.jks
Binary files differ