2FA: bug fixes

Author: sk-keeper

Commander/ConnectedCommands.cs

@@ -568,6 +568,11 @@ private async Task GetCommand(string uid)
                     tab.AddRow("$url:", legacy.Link);
                     if (!string.IsNullOrEmpty(legacy.Totp))
                     {
+                        if (totps == null)
+                        {
+                            totps = new List<string>();
+                        }
+                        totps.Add(legacy.Totp);
                         tab.AddRow("$oneTimeCode:", legacy.Totp);
                     }
                     if (legacy.Custom != null && legacy.Custom.Count > 0)
@@ -583,7 +588,7 @@ private async Task GetCommand(string uid)
                     tab.AddRow("Notes:", typed.Notes);
                     foreach (var f in typed.Fields.Concat(typed.Custom))
                     {
-                        if (f.FieldName == "totp")
+                        if (f.FieldName == "oneTimeCode")
                         {
                             if (totps == null)
                             {
@@ -627,10 +632,14 @@ private async Task GetCommand(string uid)
                 {
                     foreach (var url in totps)
                     {
+                        tab.AddRow("$oneTimeCode:", url);
                         try
                         {
                             var tup = CryptoUtils.GetTotpCode(url);
-                            tab.AddRow($"{tup.Item1}:", $"expires in {tup.Item3 - tup.Item2} sec.");
+                            if (tup != null)
+                            {
+                                tab.AddRow($"{tup.Item1}:", $"expires in {tup.Item3 - tup.Item2} sec.");
+                            }
                         }
                         catch (Exception e)
                         {

KeeperSdk/utils/CryptoUtils.cs

@@ -514,7 +514,7 @@ internal static byte[] Base32ToBytes(string base32)
             const string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
             var output = new List<byte>();
             var bytes = base32.ToCharArray();
-            for (var bitIndex = 0; bitIndex < base32.Length * 5; bitIndex += 8)
+            for (var bitIndex = 0; bitIndex / 5 + 1 < bytes.Length; bitIndex += 8)
             {
                 var dualByte = alphabet.IndexOf(bytes[bitIndex / 5]) << 10;
                 if (bitIndex / 5 + 1 < bytes.Length)
@@ -586,6 +586,9 @@ public static Tuple<string, int, int> GetTotpCode(string url)
                 case "SHA256":
                     hmac = new HMACSHA256(secretBytes);
                     break;
+                case "SHA512":
+                    hmac = new HMACSHA512(secretBytes);
+                    break;
                 case "MD5":
                     hmac = new HMACMD5(secretBytes);
                     break;

PowerCommander/RecordCommands.ps1

@@ -201,7 +201,7 @@ function Show-TwoFactorCode {
 	End {
 		$output = @()
 		foreach ($totp in $totps) {
-			[Tuple[string, int, int]]$code = [KeeperSecurity.Utils.CryptoUtils]::GetTotpCode($totps.TotpData)
+			[Tuple[string, int, int]]$code = [KeeperSecurity.Utils.CryptoUtils]::GetTotpCode($totp.TotpData)
 			if ($code) {
 				$output += [PSCustomObject]@{
 					PSTypeName   = 'TOTP.Codes'