From b8af6c0c902c4442b55386a00a96d5d9ee09213d Mon Sep 17 00:00:00 2001 From: Graham Date: Tue, 14 Jan 2020 23:59:56 +0000 Subject: [PATCH] Write public RSA key to disk I think it's useful even though we don't read it. --- .../java/dev/openrs2/common/crypto/RsaKeyProvider.kt | 12 +++++++----- conf/.gitignore | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/dev/openrs2/common/crypto/RsaKeyProvider.kt b/common/src/main/java/dev/openrs2/common/crypto/RsaKeyProvider.kt index 97dd7d1c55..a4f3ff28cb 100644 --- a/common/src/main/java/dev/openrs2/common/crypto/RsaKeyProvider.kt +++ b/common/src/main/java/dev/openrs2/common/crypto/RsaKeyProvider.kt @@ -7,16 +7,18 @@ import javax.inject.Provider class RsaKeyProvider : Provider { override fun get(): RSAPrivateCrtKeyParameters { - return if (Files.exists(PATH)) { - Rsa.readPrivateKey(PATH) + return if (Files.exists(PRIVATE_PATH)) { + Rsa.readPrivateKey(PRIVATE_PATH) } else { - val (_, private) = Rsa.generateKeyPair() - Rsa.writePrivateKey(PATH, private) + val (public, private) = Rsa.generateKeyPair() + Rsa.writePublicKey(PUBLIC_PATH, public) + Rsa.writePrivateKey(PRIVATE_PATH, private) private } } companion object { - private val PATH = Paths.get("conf/private.key") + private val PUBLIC_PATH = Paths.get("conf/public.key") + private val PRIVATE_PATH = Paths.get("conf/private.key") } } diff --git a/conf/.gitignore b/conf/.gitignore index b8bd887f2e..5280d6cc8d 100644 --- a/conf/.gitignore +++ b/conf/.gitignore @@ -1 +1,2 @@ /private.key +/public.key