From b3957bb76fa42f7722df63212de9ef5b0ccaa10a Mon Sep 17 00:00:00 2001 From: Impyy Date: Tue, 16 Aug 2016 00:25:06 +0200 Subject: [PATCH] Fixed the TOTP test --- app/src/test/java/me/impy/aegis/TOTPTest.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/test/java/me/impy/aegis/TOTPTest.java b/app/src/test/java/me/impy/aegis/TOTPTest.java index bbba05de..ccc00f73 100644 --- a/app/src/test/java/me/impy/aegis/TOTPTest.java +++ b/app/src/test/java/me/impy/aegis/TOTPTest.java @@ -35,14 +35,24 @@ public class TOTPTest { new testVector(){{ Time = "0000000027BC86AA"; OTP = "47863826"; Mode = "HmacSHA512"; }} }; - private final String _seed = "3132333435363738393031323334353637383930"; - private final String _seed32 = "3132333435363738393031323334353637383930313233343536373839303132"; - private final String _seed64 = "31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334"; + private final byte[] _seed = new byte[] { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30 + }; + private final byte[] _seed32 = new byte[] { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32 + }; + private final byte[] _seed64 = new byte[] { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, + 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, + 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, + 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34 + }; @Test public void vectors_match() throws Exception { for (testVector v : _vectors) { - String seed; + byte[] seed; switch (v.Mode) { case "HmacSHA1": @@ -59,7 +69,7 @@ public class TOTPTest { return; } - String otp = TOTP.generateTOTP(seed, v.Time, "8", v.Mode); + String otp = TOTP.generateTOTP(seed, v.Time, 8, v.Mode); assertEquals(v.OTP, otp); } }