mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-24 18:08:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

add steam support for otp generation

Browse source
This commit is contained in:
Kyle Spearrin 2018-11-29 17:10:51 -05:00
parent 7ff628ea51
commit 8175af4e84
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/App/Models/OtpAuth.cs
View file

@ -44,6 +44,12 @@ namespace Bit.App.Models
} }
} }
} }
else if (key?.ToLowerInvariant().StartsWith("steam://") ?? false)
{
Steam = true;
Digits = 5;
Secret = key.Substring(8);
}
else else
{ {
Secret = key; Secret = key;
@ -54,5 +60,6 @@ namespace Bit.App.Models
public int Digits { get; set; } = 6; public int Digits { get; set; } = 6;
public MacAlgorithm Algorithm { get; set; } = MacAlgorithm.HmacSha1; public MacAlgorithm Algorithm { get; set; } = MacAlgorithm.HmacSha1;
public string Secret { get; set; } public string Secret { get; set; }
public bool Steam { get; set; }
} }
} }

20
src/App/Utilities/Crypto.cs
View file

@ -9,6 +9,8 @@ namespace Bit.App.Utilities
{ {
public static class Crypto public static class Crypto
{ {
private static string SteamChars = "23456789BCDFGHJKMNPQRTVWXY";
public static CipherString AesCbcEncrypt(byte[] plainBytes, SymmetricCryptoKey key) public static CipherString AesCbcEncrypt(byte[] plainBytes, SymmetricCryptoKey key)
{ {
var parts = AesCbcEncryptToParts(plainBytes, key); var parts = AesCbcEncryptToParts(plainBytes, key);
@ -203,9 +205,23 @@ namespace Bit.App.Utilities
var offset = (hash[hash.Length - 1] & 0xf); var offset = (hash[hash.Length - 1] & 0xf);
var binary = ((hash[offset] & 0x7f) << 24) | ((hash[offset + 1] & 0xff) << 16) | var binary = ((hash[offset] & 0x7f) << 24) | ((hash[offset + 1] & 0xff) << 16) |
((hash[offset + 2] & 0xff) << 8) | (hash[offset + 3] & 0xff); ((hash[offset + 2] & 0xff) << 8) | (hash[offset + 3] & 0xff);
var otp = binary % (int)Math.Pow(10, otpParams.Digits);
return otp.ToString().PadLeft(otpParams.Digits, '0'); string otp = string.Empty;
if(otpParams.Steam)
{
var fullCode = binary & 0x7fffffff;
for(var i = 0; i < otpParams.Digits; i++)
{
otp += SteamChars[fullCode % SteamChars.Length];
fullCode = (int)Math.Truncate(fullCode / (double)SteamChars.Length);
}
}
else
{
var rawOtp = binary % (int)Math.Pow(10, otpParams.Digits);
otp = rawOtp.ToString().PadLeft(otpParams.Digits, '0');
}
return otp;
} }
// ref: https://tools.ietf.org/html/rfc5869 // ref: https://tools.ietf.org/html/rfc5869