nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-29 23:34:53 -05:00
Code

add support for OAEP SHA1

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-21 12:52:49 -04:00
parent abf8ab2c73
commit 62e35f0a1a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Enums/EncryptionType.cs
View File

@ -5,6 +5,7 @@
AesCbc256_B64 = 0, AesCbc256_B64 = 0,
AesCbc128_HmacSha256_B64 = 1, AesCbc128_HmacSha256_B64 = 1,
AesCbc256_HmacSha256_B64 = 2, AesCbc256_HmacSha256_B64 = 2,
RsaOaep_Sha256_B64 = 3 Rsa2048_OaepSha256_B64 = 3,
Rsa2048_OaepSha1_B64 = 4
} }
} }

6
src/Core/Utilities/EncryptedValueAttribute.cs
View File

@ -67,7 +67,8 @@ namespace Bit.Core.Utilities
return false; return false;
} }
break; break;
case Enums.EncryptionType.RsaOaep_Sha256_B64: case Enums.EncryptionType.Rsa2048_OaepSha256_B64:
case Enums.EncryptionType.Rsa2048_OaepSha1_B64:
if(encStringPieces.Length != 1) if(encStringPieces.Length != 1)
{ {
return false; return false;
@ -77,7 +78,8 @@ namespace Bit.Core.Utilities
return false; return false;
} }
if(encType != Enums.EncryptionType.RsaOaep_Sha256_B64) if(encType != Enums.EncryptionType.Rsa2048_OaepSha1_B64 &&
encType != Enums.EncryptionType.Rsa2048_OaepSha256_B64)
{ {
var iv = Convert.FromBase64String(encStringPieces[0]); var iv = Convert.FromBase64String(encStringPieces[0]);
var ct = Convert.FromBase64String(encStringPieces[1]); var ct = Convert.FromBase64String(encStringPieces[1]);