diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2019-03-19 20:34:41 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 20:34:41 +0530 |
| commit | 94bf103b337d9df1d6232d85f5edf4673ede651c (patch) | |
| tree | 84c3971b0f95f0586923b5e3a8262137236a2b80 /app/src/main/java/com/zeapo/pwdstore/crypto | |
| parent | 59ac91ebbc9f1d63c0377890902cc5c12f0af4c6 (diff) | |
| parent | 2ca59d95f962d333f56c714f1e0b97d38db4785a (diff) | |
| download | HardenedPass-94bf103b337d9df1d6232d85f5edf4673ede651c.tar.gz HardenedPass-94bf103b337d9df1d6232d85f5edf4673ede651c.zip | |
Merge pull request #491 from igaryhe/master
Read OTP digits, algorithm, period from URI, support Steam Guard
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/crypto')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index c7b1273f..81a79d05 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -305,12 +305,17 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { copyOtpToClipBoard( Otp.calculateCode( entry.totpSecret, - Date().time / (1000 * Otp.TIME_WINDOW) - ) + Date().time / (1000 * entry.totpPeriod), + entry.totpAlgorithm, + entry.digits) ) } crypto_otp_show.text = - Otp.calculateCode(entry.totpSecret, Date().time / (1000 * Otp.TIME_WINDOW)) + Otp.calculateCode( + entry.totpSecret, + Date().time / (1000 * entry.totpPeriod), + entry.totpAlgorithm, + entry.digits) } else { // we only want to calculate and show HOTP if the user requests it crypto_copy_otp.setOnClickListener { @@ -494,8 +499,8 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { } private fun calculateHotp(entry: PasswordEntry) { - copyOtpToClipBoard(Otp.calculateCode(entry.hotpSecret, entry.hotpCounter!! + 1)) - crypto_otp_show.text = Otp.calculateCode(entry.hotpSecret, entry.hotpCounter!! + 1) + copyOtpToClipBoard(Otp.calculateCode(entry.hotpSecret, entry.hotpCounter!! + 1, "sha1", entry.digits)) + crypto_otp_show.text = Otp.calculateCode(entry.hotpSecret, entry.hotpCounter!! + 1, "sha1", entry.digits) crypto_extra_show.text = entry.extraContent } |