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

Compat. - no header for AesCbc256_B64 cipherstring

Browse source
This commit is contained in:
Kyle Spearrin 2017-04-26 11:28:03 -04:00
parent c8219b29c0
commit 70c57928e7
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,13 +83,18 @@ namespace Bit.App.Models
} }
EncryptionType = encryptionType; EncryptionType = encryptionType;
EncryptedString = string.Format("{0}.{1}|{2}", (byte)encryptionType, initializationVector, cipherText); EncryptedString = string.Format("{0}|{1}", initializationVector, cipherText);
if(!string.IsNullOrWhiteSpace(mac)) if(!string.IsNullOrWhiteSpace(mac))
{ {
EncryptedString = string.Format("{0}|{1}", EncryptedString, mac); EncryptedString = string.Format("{0}|{1}", EncryptedString, mac);
} }
if(EncryptionType != EncryptionType.AesCbc256_B64)
{
EncryptedString = string.Format("{0}.{1}", (byte)EncryptionType, EncryptedString);
}
CipherText = cipherText; CipherText = cipherText;
InitializationVector = initializationVector; InitializationVector = initializationVector;
Mac = mac; Mac = mac;