Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit a012317

Browse files
stephentoubstephentoub
committed
Merge pull request #1947 from bartonjs/add-cryptography-derivebytes
Add System.Security.Cryptography.DeriveBytes Source and Tests
2 parents 04e3885 + 454f16c commit a012317

File tree

12 files changed

+2058
-0
lines changed

12 files changed

+2058
-0
lines changed

‎src/System.Security.Cryptography.DeriveBytes/System.Security.Cryptography.DeriveBytes.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.22911.2
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.DeriveBytes", "src\System.Security.Cryptography.DeriveBytes.csproj", "{37EA129F-CC17-4207-A3DB-691BA6432790}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.DeriveBytes.Tests", "tests\System.Security.Cryptography.DeriveBytes.Tests.csproj", "{73827B8E-878E-422B-8715-1B9D92270B4C}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{37EA129F-CC17-4207-A3DB-691BA6432790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{37EA129F-CC17-4207-A3DB-691BA6432790}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{37EA129F-CC17-4207-A3DB-691BA6432790}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{37EA129F-CC17-4207-A3DB-691BA6432790}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{73827B8E-878E-422B-8715-1B9D92270B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{73827B8E-878E-422B-8715-1B9D92270B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{73827B8E-878E-422B-8715-1B9D92270B4C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
23+
{73827B8E-878E-422B-8715-1B9D92270B4C}.Release|Any CPU.Build.0 = Debug|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

‎src/System.Security.Cryptography.DeriveBytes/src/Internal/Cryptography/Helpers.cs

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System.Diagnostics;
5+
using System.Security.Cryptography;
6+
7+
namespace Internal.Cryptography
8+
{
9+
internal static class Helpers
10+
{
11+
public static byte[] CloneByteArray(this byte[] src)
12+
{
13+
return (byte[])(src.Clone());
14+
}
15+
16+
public static byte[] GenerateRandom(int count)
17+
{
18+
byte[] buffer = new byte[count];
19+
20+
using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
21+
{
22+
rng.GetBytes(buffer);
23+
}
24+
25+
return buffer;
26+
}
27+
28+
// encodes the integer i into a 4-byte array, in big endian.
29+
public static void WriteInt(uint i, byte[] arr, int offset)
30+
{
31+
unchecked
32+
{
33+
Debug.Assert(arr != null);
34+
Debug.Assert(arr.Length >= offset + sizeof(uint));
35+
36+
arr[offset] = (byte)(i >> 24);
37+
arr[offset + 1] = (byte)(i >> 16);
38+
arr[offset + 2] = (byte)(i >> 8);
39+
arr[offset + 3] = (byte)i;
40+
}
41+
}
42+
}
43+
}
44+

‎src/System.Security.Cryptography.DeriveBytes/src/Resources/Strings.resx

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
121+
<value>Non-negative number required.</value>
122+
</data>
123+
<data name="ArgumentOutOfRange_NeedPosNum" xml:space="preserve">
124+
<value>Positive number required.</value>
125+
</data>
126+
<data name="Cryptography_InvalidKeySize" xml:space="preserve">
127+
<value>Specified key is not a valid size for this algorithm.</value>
128+
</data>
129+
<data name="Cryptography_PasswordDerivedBytes_FewBytesSalt" xml:space="preserve">
130+
<value>Salt is not at least eight bytes.</value>
131+
</data>
132+
<data name="Cryptography_PasswordDerivedBytes_InvalidAlgorithm" xml:space="preserve">
133+
<value>Algorithm is unavailable or is not supported for this operation.</value>
134+
</data>
135+
<data name="Cryptography_PasswordDerivedBytes_InvalidIV" xml:space="preserve">
136+
<value>The Initialization vector should have the same length as the algorithm block size in bytes.</value>
137+
</data>
138+
</root>

‎src/System.Security.Cryptography.DeriveBytes/src/System.Security.Cryptography.DeriveBytes.csproj

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{37EA129F-CC17-4207-A3DB-691BA6432790}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AssemblyName>System.Security.Cryptography.DeriveBytes</AssemblyName>
10+
<AssemblyVersion>4.0.0.0</AssemblyVersion>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
14+
<ItemGroup>
15+
<Compile Include="Internal\Cryptography\Helpers.cs" />
16+
<Compile Include="System\Security\Cryptography\DeriveBytes.cs" />
17+
<Compile Include="System\Security\Cryptography\Rfc2898DeriveBytes.cs" />
18+
</ItemGroup>
19+
<ItemGroup>
20+
<None Include="project.json" />
21+
</ItemGroup>
22+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
23+
</Project>

‎src/System.Security.Cryptography.DeriveBytes/src/System/Security/Cryptography/DeriveBytes.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
namespace System.Security.Cryptography
5+
{
6+
public abstract class DeriveBytes : IDisposable
7+
{
8+
public abstract byte[] GetBytes(int cb);
9+
public abstract void Reset();
10+
11+
public void Dispose()
12+
{
13+
Dispose(true);
14+
GC.SuppressFinalize(this);
15+
}
16+
17+
protected virtual void Dispose(bool disposing)
18+
{
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)