diff options
author | Antoine A <> | 2024-03-27 01:06:48 +0100 |
---|---|---|
committer | Antoine A <> | 2024-03-27 01:08:18 +0100 |
commit | dc03013dfcc3acc17bb8f54e842ccc6740caa040 (patch) | |
tree | bbe96517ac64ba33a78f89b5f1a46dacacd82ece /nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt | |
parent | 9dfbc9391fe27fc631bdf61e3e51dd3a124a4c60 (diff) | |
download | libeufin-dc03013dfcc3acc17bb8f54e842ccc6740caa040.tar.gz libeufin-dc03013dfcc3acc17bb8f54e842ccc6740caa040.tar.bz2 libeufin-dc03013dfcc3acc17bb8f54e842ccc6740caa040.zip |
Clean and optimize EBICS mess
Diffstat (limited to 'nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt')
-rw-r--r-- | nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt index b4acbb75..172cffa2 100644 --- a/nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt +++ b/nexus/src/main/kotlin/tech/libeufin/nexus/KeyFiles.kt @@ -111,9 +111,9 @@ data class BankPublicKeysFile( */ fun generateNewKeys(): ClientPrivateKeysFile = ClientPrivateKeysFile( - authentication_private_key = CryptoUtil.generateRsaKeyPair(2048).private, - encryption_private_key = CryptoUtil.generateRsaKeyPair(2048).private, - signature_private_key = CryptoUtil.generateRsaKeyPair(2048).private, + authentication_private_key = CryptoUtil.genRSAPrivate(2048), + encryption_private_key = CryptoUtil.genRSAPrivate(2048), + signature_private_key = CryptoUtil.genRSAPrivate(2048), submitted_hia = false, submitted_ini = false ) @@ -202,18 +202,16 @@ fun loadClientKeys(location: Path): ClientPrivateKeysFile? = loadJsonFile(locati * @param cfg configuration handle. * @return both client and bank keys */ -fun expectFullKeys( - cfg: EbicsSetupConfig -): Pair<ClientPrivateKeysFile, BankPublicKeysFile> { - val clientKeys = loadClientKeys(cfg.clientPrivateKeysFilename) +fun expectFullKeys(cfg: NexusConfig): Pair<ClientPrivateKeysFile, BankPublicKeysFile> { + val clientKeys = loadClientKeys(cfg.clientPrivateKeysPath) if (clientKeys == null) { - throw Exception("Missing client private keys file at '${cfg.clientPrivateKeysFilename}', run 'libeufin-nexus ebics-setup' first") + throw Exception("Missing client private keys file at '${cfg.clientPrivateKeysPath}', run 'libeufin-nexus ebics-setup' first") } else if (!clientKeys.submitted_ini || !clientKeys.submitted_hia) { throw Exception("Unsubmitted client private keys, run 'libeufin-nexus ebics-setup' first") } - val bankKeys = loadBankKeys(cfg.bankPublicKeysFilename) + val bankKeys = loadBankKeys(cfg.bankPublicKeysPath) if (bankKeys == null) { - throw Exception("Missing bank public keys at '${cfg.bankPublicKeysFilename}', run 'libeufin-nexus ebics-setup' first") + throw Exception("Missing bank public keys at '${cfg.bankPublicKeysPath}', run 'libeufin-nexus ebics-setup' first") } else if (!bankKeys.accepted) { throw Exception("Unaccepted bank public keys, run 'libeufin-nexus ebics-setup' until accepting the bank keys") } |