From eea0e68dda1eb7248c6d458f52baeedb318b466a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Tue, 25 Sep 2018 13:45:54 -0400 Subject: Display HOTP code if password contains HOTP secret, unify HOTP and TOTP code (#413) * Display HOTP code if password contains HOTP secret, unify HOTP and TOTP code * Add ability to show HOTP instead of showing every decrypt * Fix off by 1 error * fix return intent logic so that edits and HOTP increments are properly committed * fix linting errors * Fix broken logic for case when a password is created * add ability to choose if password entry will be updated on HOTP code calculation --- .../main/java/com/zeapo/pwdstore/utils/Totp.java | 50 ---------------------- 1 file changed, 50 deletions(-) delete mode 100644 app/src/main/java/com/zeapo/pwdstore/utils/Totp.java (limited to 'app/src/main/java/com/zeapo/pwdstore/utils/Totp.java') diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/Totp.java b/app/src/main/java/com/zeapo/pwdstore/utils/Totp.java deleted file mode 100644 index 5e4326e2..00000000 --- a/app/src/main/java/com/zeapo/pwdstore/utils/Totp.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zeapo.pwdstore.utils; - -import android.util.Log; - -import org.apache.commons.codec.binary.Base32; - -import java.math.BigInteger; -import java.nio.ByteBuffer; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; - -public class Totp { - - private static final String ALGORITHM = "HmacSHA1"; - private static final int TIME_WINDOW = 30; - private static final int CODE_DIGITS = 6; - - private static final Base32 BASE_32 = new Base32(); - - private Totp() { - } - - public static String calculateCode(String secret, long epochSeconds) { - SecretKeySpec signingKey = new SecretKeySpec(BASE_32.decode(secret), ALGORITHM); - - Mac mac = null; - try { - mac = Mac.getInstance(ALGORITHM); - mac.init(signingKey); - } catch (NoSuchAlgorithmException e) { - Log.e("TOTP", ALGORITHM + " unavailable - should never happen", e); - return null; - } catch (InvalidKeyException e) { - Log.e("TOTP", "Key is malformed", e); - return null; - } - - long time = epochSeconds / TIME_WINDOW; - byte[] digest = mac.doFinal(ByteBuffer.allocate(8).putLong(time).array()); - int offset = digest[digest.length - 1] & 0xf; - byte[] code = Arrays.copyOfRange(digest, offset, offset + 4); - code[0] = (byte) (0x7f & code[0]); - String strCode = new BigInteger(code).toString(); - return strCode.substring(strCode.length() - CODE_DIGITS); - } -} -- cgit v1.2.3