mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-30 22:05:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SshjSessionFactory: use runCatching to replace exception handling

Browse Source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya
2020-09-05 20:36:19 +05:30
parent ee6fd10ea6
commit e6675d989d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/zeapo/pwdstore/git/sshj/SshjSessionFactory.kt
View File

@@ -8,11 +8,12 @@ import android.util.Base64
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import com.github.ajalt.timberkt.d import com.github.ajalt.timberkt.d
import com.github.ajalt.timberkt.w import com.github.ajalt.timberkt.w
import com.github.michaelbull.result.getOrElse
import com.github.michaelbull.result.runCatching
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.io.InputStream import java.io.InputStream
import java.io.OutputStream import java.io.OutputStream
import java.security.GeneralSecurityException
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.coroutines.Continuation import kotlin.coroutines.Continuation
import kotlin.coroutines.suspendCoroutine import kotlin.coroutines.suspendCoroutine
@@ -80,9 +81,9 @@ class SshjSessionFactory(private val authData: SshAuthData, private val hostKeyF
private fun makeTofuHostKeyVerifier(hostKeyFile: File): HostKeyVerifier { private fun makeTofuHostKeyVerifier(hostKeyFile: File): HostKeyVerifier {
if (!hostKeyFile.exists()) { if (!hostKeyFile.exists()) {
return HostKeyVerifier { _, _, key -> return HostKeyVerifier { _, _, key ->
val digest = try { val digest = runCatching {
SecurityUtils.getMessageDigest("SHA-256") SecurityUtils.getMessageDigest("SHA-256")
} catch (e: GeneralSecurityException) { }.getOrElse { e ->
throw SSHRuntimeException(e) throw SSHRuntimeException(e)
} }
digest.update(PlainBuffer().putPublicKey(key).compactData) digest.update(PlainBuffer().putPublicKey(key).compactData)