Skip to content

One shot CFB #55480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bartonjs merged 21 commits into from
Jul 13, 2021
Merged

One shot CFB #55480

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a6c5b91
Implement base CFB one-shot APIs on SymmetricAlgorithm.
vcsjones Jul 8, 2021
9661097
AES CFB one shots and CFB8 tests
vcsjones Jul 8, 2021
85ad0d6
AES CFB128 theories
vcsjones Jul 9, 2021
07ab470
Basic 3DES functionality
vcsjones Jul 9, 2021
247433f
3DES CFB one shot tests
vcsjones Jul 9, 2021
eb80d0f
DES one shots
vcsjones Jul 9, 2021
aea07c8
Test unsupported feedback sizes
vcsjones Jul 9, 2021
1fdec38
Cipher tests for CFB
vcsjones Jul 9, 2021
5430e17
SymmetricAlgorithm tests
vcsjones Jul 9, 2021
429524c
Fix accidentally removed test
vcsjones Jul 9, 2021
030b1be
WIP
vcsjones Jul 9, 2021
37ed8e0
Finish up docs
vcsjones Jul 9, 2021
9a040bc
Plumb feedback size parameter through CNG implementations.
vcsjones Jul 11, 2021
0bbbb36
Fix CSP tests
vcsjones Jul 11, 2021
bd5df87
WIP
vcsjones Jul 11, 2021
0596d6d
Prevent CFB128 and CFB64 for AES and 3DES persisted keys
vcsjones Jul 11, 2021
1ab571b
Fix DES provider build
vcsjones Jul 11, 2021
6591592
Merge remote-tracking branch 'ms/main' into 2406-one-shot-cfb
vcsjones Jul 12, 2021
ef9cd77
Update comment to be more clear.
vcsjones Jul 12, 2021
cdb54a1
Fix XML docs to be in the same order as the parameters are declared
vcsjones Jul 12, 2021
91cf551
Reuse existing exception message
vcsjones Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Basic 3DES functionality
  • Loading branch information
@vcsjones
vcsjones authored Jul 9, 2021
commit 07ab4705569b39964906573d7418a0b8ef34132e
74 changes: 48 additions & 26 deletions ...m/Security/Cryptography/AlgorithmImplementations/TripleDES/TripleDESCipherOneShotTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,68 +28,68 @@ public class TripleDESCipherOneShotTests : SymmetricOneShotBase

[Theory]
[MemberData(nameof(TestCases))]
public void OneShotRoundtrip(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
OneShotRoundtripTest(plaintext, ciphertext, padding, mode);
public void OneShotRoundtrip(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
OneShotRoundtripTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryDecryptOneShot_DestinationTooSmall(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryDecryptOneShot_DestinationTooSmallTest(plaintext, ciphertext, padding, mode);
public void TryDecryptOneShot_DestinationTooSmall(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryDecryptOneShot_DestinationTooSmallTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryEncryptOneShot_DestinationTooSmall(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryEncryptOneShot_DestinationTooSmallTest(plaintext, ciphertext, padding, mode);
public void TryEncryptOneShot_DestinationTooSmall(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryEncryptOneShot_DestinationTooSmallTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryDecryptOneShot_DestinationJustRight(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryDecryptOneShot_DestinationJustRightTest(plaintext, ciphertext, padding, mode);
public void TryDecryptOneShot_DestinationJustRight(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryDecryptOneShot_DestinationJustRightTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryEncryptOneShot_DestinationJustRight(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryEncryptOneShot_DestinationJustRightTest(plaintext, ciphertext, padding, mode);
public void TryEncryptOneShot_DestinationJustRight(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryEncryptOneShot_DestinationJustRightTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryDecryptOneShot_DestinationLarger(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryDecryptOneShot_DestinationLargerTest(plaintext, ciphertext, padding, mode);
public void TryDecryptOneShot_DestinationLarger(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryDecryptOneShot_DestinationLargerTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryEncryptOneShot_DestinationLarger(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryEncryptOneShot_DestinationLargerTest(plaintext, ciphertext, padding, mode);
public void TryEncryptOneShot_DestinationLarger(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryEncryptOneShot_DestinationLargerTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryDecryptOneShot_Overlaps(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryDecryptOneShot_OverlapsTest(plaintext, ciphertext, padding, mode);
public void TryDecryptOneShot_Overlaps(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryDecryptOneShot_OverlapsTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void TryEncryptOneShot_Overlaps(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
TryEncryptOneShot_OverlapsTest(plaintext, ciphertext, padding, mode);
public void TryEncryptOneShot_Overlaps(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
TryEncryptOneShot_OverlapsTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void DecryptOneShot_Span(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
DecryptOneShot_SpanTest(plaintext, ciphertext, padding, mode);
public void DecryptOneShot_Span(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
DecryptOneShot_SpanTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void EncryptOneShot_Span(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
EncryptOneShot_SpanTest(plaintext, ciphertext, padding, mode);
public void EncryptOneShot_Span(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
EncryptOneShot_SpanTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void DecryptOneShot_Array(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
DecryptOneShot_ArrayTest(plaintext, ciphertext, padding, mode);
public void DecryptOneShot_Array(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
DecryptOneShot_ArrayTest(plaintext, ciphertext, padding, mode, feedbackSize);

[Theory]
[MemberData(nameof(TestCases))]
public void EncryptOneShot_Array(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode) =>
EncryptOneShot_ArrayTest(plaintext, ciphertext, padding, mode);
public void EncryptOneShot_Array(byte[] plaintext, byte[] ciphertext, PaddingMode padding, CipherMode mode, int feedbackSize = 0) =>
EncryptOneShot_ArrayTest(plaintext, ciphertext, padding, mode, feedbackSize);

public static IEnumerable<object[]> TestCases
{
Expand Down Expand Up @@ -557,6 +557,28 @@ public static IEnumerable<object[]> TestCases
PaddingMode.PKCS7,
CipherMode.ECB,
};

yield return new object[]
{
// plaintext
new byte[]
{
0x50, 0x68, 0x12, 0xA4, 0x5F, 0x08, 0xC8, 0x89,
0xB9, 0x7F, 0x59, 0x80, 0x03, 0x8B, 0x83, 0x59,
},

// ciphertext
new byte[]
{
0x46, 0x85, 0x45, 0x43, 0x3E, 0xD9, 0x40, 0xAF,
0x16, 0xBE, 0xC5, 0xEF, 0xD9, 0x12, 0xFE, 0x07,
0x66,
},

PaddingMode.PKCS7,
CipherMode.CFB,
8
};
}
}
}
Expand Down
52 changes: 52 additions & 0 deletions ...tem.Security.Cryptography.Algorithms/src/Internal/Cryptography/TripleDesImplementation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,58 @@ protected override bool TryDecryptCbcCore(
}
}

protected override bool TryDecryptCfbCore(
ReadOnlySpan<byte> ciphertext,
ReadOnlySpan<byte> iv,
Span<byte> destination,
PaddingMode paddingMode,
int feedbackSizeInBits,
out int bytesWritten)
{
ValidateCFBFeedbackSize(feedbackSizeInBits);

UniversalCryptoTransform transform = CreateTransformCore(
CipherMode.CFB,
paddingMode,
Key,
iv: iv.ToArray(),
blockSize: BlockSize / BitsPerByte,
paddingSize: feedbackSizeInBits / BitsPerByte,
feedbackSizeInBits / BitsPerByte,
encrypting: false);

using (transform)
{
return transform.TransformOneShot(ciphertext, destination, out bytesWritten);
}
}

protected override bool TryEncryptCfbCore(
ReadOnlySpan<byte> plaintext,
ReadOnlySpan<byte> iv,
Span<byte> destination,
PaddingMode paddingMode,
int feedbackSizeInBits,
out int bytesWritten)
{
ValidateCFBFeedbackSize(feedbackSizeInBits);

UniversalCryptoTransform transform = CreateTransformCore(
CipherMode.CFB,
paddingMode,
Key,
iv: iv.ToArray(),
blockSize: BlockSize / BitsPerByte,
paddingSize: feedbackSizeInBits / BitsPerByte,
feedbackSizeInBits / BitsPerByte,
encrypting: true);

using (transform)
{
return transform.TransformOneShot(plaintext, destination, out bytesWritten);
}
}

private static void ValidateCFBFeedbackSize(int feedback)
{
// only 8bits/64bits feedback would be valid.
Expand Down