Skip to content

Commit d817f03

Browse files
PranavSenthilnathanPranavSenthilnathan
authored
refactor stuff (#117850)
1 parent 5630010 commit d817f03

File tree

18 files changed

+62
-88
lines changed

18 files changed

+62
-88
lines changed

‎src/libraries/Common/src/System/Security/Cryptography/CngHelpers.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,7 @@ internal static unsafe bool ExportPkcs8KeyBlob(
192192

193193
Interop.NCrypt.PBE_PARAMS pbeParams = default;
194194
Span<byte> salt = new Span<byte>(pbeParams.rgbSalt, Interop.NCrypt.PBE_PARAMS.RgbSaltSize);
195-
#if NET
196195
RandomNumberGenerator.Fill(salt);
197-
#else
198-
CngHelpers.GetRandomBytes(salt);
199-
#endif
200196
pbeParams.Params.cbSalt = salt.Length;
201197
pbeParams.Params.iIterations = kdfCount;
202198

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/CompositeMLDsa/CompositeMLDsaTestHelpers.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System.Collections.Generic;
55
using System.Formats.Asn1;
6+
using System.Security.Cryptography.Rsa.Tests;
67
using Xunit;
78
using Xunit.Sdk;
89

@@ -189,7 +190,7 @@ internal static void AssertPrivateKeyEquals(CompositeMLDsaAlgorithm algorithm, R
189190
RSAParameters expectedRsaParameters = RSAParametersFromRawPrivateKey(expectedTradKey);
190191
RSAParameters actualRsaParameters = RSAParametersFromRawPrivateKey(actualTradKey);
191192

192-
Rsa.Tests.ImportExport.AssertKeyEquals(expectedRsaParameters, actualRsaParameters);
193+
RSATestHelpers.AssertKeyEquals(expectedRsaParameters, actualRsaParameters);
193194
},
194195
_ => Assert.Equal(expectedTradKey, actualTradKey),
195196
_ => Assert.Equal(expectedTradKey, actualTradKey));

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void PaddedExport()
6666

6767
// DP is the most likely to fail, the rest just otherwise ensure that Export
6868
// isn't losing data.
69-
AssertKeyEquals(diminishedDPParameters, exported);
69+
RSATestHelpers.AssertKeyEquals(diminishedDPParameters, exported);
7070
}
7171

7272
[Fact]
@@ -94,7 +94,7 @@ public static void LargeKeyImportExport()
9494

9595
exported = rsa.ExportParameters(true);
9696

97-
AssertKeyEquals(imported, exported);
97+
RSATestHelpers.AssertKeyEquals(imported, exported);
9898
}
9999
}
100100

@@ -119,7 +119,7 @@ public static void UnusualExponentImportExport()
119119

120120
// Exponent is the most likely to fail, the rest just otherwise ensure that Export
121121
// isn't losing data.
122-
AssertKeyEquals(unusualExponentParameters, exported);
122+
RSATestHelpers.AssertKeyEquals(unusualExponentParameters, exported);
123123
}
124124

125125
[Fact]
@@ -136,7 +136,7 @@ public static void ImportExport1032()
136136
exportedPublic = rsa.ExportParameters(false);
137137
}
138138

139-
AssertKeyEquals(imported, exported);
139+
RSATestHelpers.AssertKeyEquals(imported, exported);
140140

141141
Assert.Equal(exportedPublic.Modulus, imported.Modulus);
142142
Assert.Equal(exportedPublic.Exponent, imported.Exponent);
@@ -169,7 +169,7 @@ public static void ImportReset()
169169
Assert.Equal(imported.Modulus.Length * 8, rsa.KeySize);
170170

171171
exported = rsa.ExportParameters(true);
172-
AssertKeyEquals(imported, exported);
172+
RSATestHelpers.AssertKeyEquals(imported, exported);
173173
}
174174
}
175175

@@ -207,18 +207,18 @@ public static void MultiExport()
207207
RSAParameters exportedPrivate3 = rsa.ExportParameters(true);
208208
RSAParameters exportedPublic3 = rsa.ExportParameters(false);
209209

210-
AssertKeyEquals(imported, exportedPrivate);
210+
RSATestHelpers.AssertKeyEquals(imported, exportedPrivate);
211211

212212
Assert.Equal(imported.Modulus, exportedPublic.Modulus);
213213
Assert.Equal(imported.Exponent, exportedPublic.Exponent);
214214
Assert.Null(exportedPublic.D);
215215
ValidateParameters(ref exportedPublic);
216216

217-
AssertKeyEquals(exportedPrivate, exportedPrivate2);
218-
AssertKeyEquals(exportedPrivate, exportedPrivate3);
217+
RSATestHelpers.AssertKeyEquals(exportedPrivate, exportedPrivate2);
218+
RSATestHelpers.AssertKeyEquals(exportedPrivate, exportedPrivate3);
219219

220-
AssertKeyEquals(exportedPublic, exportedPublic2);
221-
AssertKeyEquals(exportedPublic, exportedPublic3);
220+
RSATestHelpers.AssertKeyEquals(exportedPublic, exportedPublic2);
221+
RSATestHelpers.AssertKeyEquals(exportedPublic, exportedPublic3);
222222
}
223223
}
224224

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyFileTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ private static void ReadWriteKey(
14541454
arrayExport = writeArrayFunc(rsa);
14551455

14561456
RSAParameters rsaParameters = rsa.ExportParameters(isPrivateKey);
1457-
ImportExport.AssertKeyEquals(expected, rsaParameters);
1457+
RSATestHelpers.AssertKeyEquals(expected, rsaParameters);
14581458
}
14591459

14601460
// Public key formats are stable.
@@ -1478,7 +1478,7 @@ private static void ReadWriteKey(
14781478
Assert.Equal(arrayExport.Length, bytesRead);
14791479

14801480
RSAParameters rsaParameters = rsa.ExportParameters(isPrivateKey);
1481-
ImportExport.AssertKeyEquals(expected, rsaParameters);
1481+
RSATestHelpers.AssertKeyEquals(expected, rsaParameters);
14821482

14831483
Assert.False(
14841484
writeSpanFunc(rsa, Span<byte>.Empty, out int bytesWritten),

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static void ImportFromPem_RSAPrivateKey_Simple()
4444
rsa.ImportFromPem(pem);
4545
RSAParameters rsaParameters = rsa.ExportParameters(true);
4646

47-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
47+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
4848
}
4949
}
5050

@@ -68,7 +68,7 @@ public static void ImportFromPem_Pkcs8UnEncrypted_Simple()
6868
rsa.ImportFromPem(pem);
6969
RSAParameters rsaParameters = rsa.ExportParameters(true);
7070

71-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
71+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
7272
}
7373
}
7474

@@ -97,7 +97,7 @@ public static void ImportFromPem_Pkcs8UnEncrypted_UnrelatedAlgorithmIsIgnored()
9797
rsa.ImportFromPem(pem);
9898
RSAParameters rsaParameters = rsa.ExportParameters(true);
9999

100-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
100+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
101101
}
102102
}
103103

@@ -114,7 +114,7 @@ public static void ImportFromPem_SubjectPublicKeyInfo_Simple()
114114
rsa.ImportFromPem(pem);
115115
RSAParameters rsaParameters = rsa.ExportParameters(false);
116116

117-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
117+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
118118
}
119119
}
120120

@@ -136,7 +136,7 @@ public static void ImportFromPem_SubjectPublicKeyInfo_IgnoresUnrelatedAlgorithm(
136136
rsa.ImportFromPem(pem);
137137
RSAParameters rsaParameters = rsa.ExportParameters(false);
138138

139-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
139+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
140140
}
141141
}
142142

@@ -154,7 +154,7 @@ public static void ImportFromPem_RSAPublicKey_Simple()
154154
rsa.ImportFromPem(pem);
155155
RSAParameters rsaParameters = rsa.ExportParameters(false);
156156

157-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
157+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters.ToPublic(), rsaParameters);
158158
}
159159
}
160160

@@ -191,7 +191,7 @@ public static void ImportFromPem_RSAPrivateKey_PrecedingUnrelatedPem()
191191
rsa.ImportFromPem(pem);
192192
RSAParameters rsaParameters = rsa.ExportParameters(true);
193193

194-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
194+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
195195
}
196196
}
197197

@@ -216,7 +216,7 @@ public static void ImportFromPem_RSAPrivateKey_PrecedingMalformedPem()
216216
rsa.ImportFromPem(pem);
217217
RSAParameters rsaParameters = rsa.ExportParameters(true);
218218

219-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
219+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
220220
}
221221
}
222222

@@ -243,7 +243,7 @@ public static void ImportFromPem_RSAPrivateKey_IgnoresOtherAlgorithms()
243243
rsa.ImportFromPem(pem);
244244
RSAParameters rsaParameters = rsa.ExportParameters(true);
245245

246-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
246+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
247247
}
248248
}
249249

@@ -403,7 +403,7 @@ public static void ImportFromEncryptedPem_Pkcs8Encrypted_Char_Simple()
403403
rsa.ImportFromEncryptedPem(pem, (ReadOnlySpan<char>)"test");
404404
RSAParameters rsaParameters = rsa.ExportParameters(true);
405405

406-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
406+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
407407
}
408408
}
409409

@@ -428,7 +428,7 @@ public static void ImportFromEncryptedPem_Pkcs8Encrypted_Byte_Simple()
428428
rsa.ImportFromEncryptedPem(pem, "test"u8);
429429
RSAParameters rsaParameters = rsa.ExportParameters(true);
430430

431-
ImportExport.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
431+
RSATestHelpers.AssertKeyEquals(TestData.DiminishedDPParameters, rsaParameters);
432432
}
433433
}
434434

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/ImportExport.Shared.cs‎ renamed to ‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSATestHelpers.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66

77
namespace System.Security.Cryptography.Rsa.Tests
88
{
9-
// TODO This is used in multiple tests files, so move this into a common Helpers class.
10-
public partial class ImportExport
9+
public class RSATestHelpers
1110
{
1211
internal static void AssertKeyEquals(in RSAParameters expected, in RSAParameters actual)
1312
{

‎src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAXml.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -996,15 +996,15 @@ public static void FromToXml()
996996
{
997997
rsaPub.FromXmlString(xmlPub);
998998

999-
ImportExport.AssertKeyEquals(pubOnly, rsaPub.ExportParameters(false));
999+
RSATestHelpers.AssertKeyEquals(pubOnly, rsaPub.ExportParameters(false));
10001000
}
10011001

10021002
using (RSA rsaPriv = RSAFactory.Create())
10031003
{
10041004
rsaPriv.FromXmlString(xmlPriv);
10051005

1006-
ImportExport.AssertKeyEquals(pubPriv, rsaPriv.ExportParameters(true));
1007-
ImportExport.AssertKeyEquals(pubOnly, rsaPriv.ExportParameters(false));
1006+
RSATestHelpers.AssertKeyEquals(pubPriv, rsaPriv.ExportParameters(true));
1007+
RSATestHelpers.AssertKeyEquals(pubOnly, rsaPriv.ExportParameters(false));
10081008
}
10091009
}
10101010
}
@@ -1274,7 +1274,7 @@ private static void TestReadXml(string xmlString, in RSAParameters expectedParam
12741274

12751275
bool includePrivateParameters = expectedParameters.D != null;
12761276

1277-
ImportExport.AssertKeyEquals(
1277+
RSATestHelpers.AssertKeyEquals(
12781278
expectedParameters,
12791279
rsa.ExportParameters(includePrivateParameters));
12801280
}

‎src/libraries/Microsoft.Bcl.Cryptography/src/Microsoft.Bcl.Cryptography.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@
479479
<Compile Include="$(CommonPath)Interop\Windows\NCrypt\Interop.SignVerify.cs"
480480
Link="Common\Interop\Windows\NCrypt\Interop.SignVerify.cs" />
481481

482-
<Compile Include="System\Security\Cryptography\CngHelpers.cs" />
483482
<Compile Include="System\Security\Cryptography\CngExtensions.cs" />
484483
<Compile Include="System\Security\Cryptography\CngIdentifierExtensions.cs" />
485484
</ItemGroup>

‎src/libraries/Microsoft.Bcl.Cryptography/src/System/Security/Cryptography/CngHelpers.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/libraries/Microsoft.Bcl.Cryptography/tests/Microsoft.Bcl.Cryptography.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@
192192
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.cs" />
193193
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.Ietf.cs"
194194
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\MLDsa\MLDsaTestsData.Ietf.cs" />
195-
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs"
196-
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\ImportExport.Shared.cs" />
195+
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs"
196+
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\RSA\RSATestHelpers.cs" />
197197
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaAlgorithmTests.cs"
198198
Link="CommonTest\System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaAlgorithmTests.cs" />
199199
<Compile Include="$(CommonTestPath)System\Security\Cryptography\AlgorithmImplementations\SlhDsa\SlhDsaContractTests.cs"

0 commit comments

Comments
 (0)