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

Commit 9aa6349

Browse files
bartonjsbartonjs
committed
Merge pull request #1944 from bartonjs/add-cryptography-rng
Add System.Security.Cryptography.RandomNumberGenerator Source and Tests
2 parents 7266abb + f394692 commit 9aa6349

13 files changed

+1706
-0
lines changed

‎src/Common/src/Interop/Unix/libcrypto/Interop.RAND.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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.Runtime.InteropServices;
5+
6+
internal static partial class Interop
7+
{
8+
internal static partial class libcrypto
9+
{
10+
[DllImport(Libraries.LibCrypto)]
11+
internal static extern unsafe int RAND_pseudo_bytes(byte* buf, int num);
12+
}
13+
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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.RandomNumberGenerator", "src\System.Security.Cryptography.RandomNumberGenerator.csproj", "{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Security.Cryptography.RandomNumberGenerator.Tests", "tests\System.Security.Cryptography.RandomNumberGenerator.Tests.csproj", "{A8FAF4B3-3B84-4164-AF8A-F808C466A059}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Linux_Debug|Any CPU = Linux_Debug|Any CPU
13+
Linux_Release|Any CPU = Linux_Release|Any CPU
14+
OSX_Debug|Any CPU = OSX_Debug|Any CPU
15+
OSX_Release|Any CPU = OSX_Release|Any CPU
16+
Windows_Debug|Any CPU = Windows_Debug|Any CPU
17+
Windows_Release|Any CPU = Windows_Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
21+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
22+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
23+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Linux_Release|Any CPU.Build.0 = Linux_Release|Any CPU
24+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|Any CPU
25+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU
26+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU
27+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU
28+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
29+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
30+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
31+
{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
32+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Linux_Release|Any CPU.ActiveCfg = Debug|Any CPU
35+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Linux_Release|Any CPU.Build.0 = Debug|Any CPU
36+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.OSX_Release|Any CPU.ActiveCfg = Debug|Any CPU
39+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.OSX_Release|Any CPU.Build.0 = Debug|Any CPU
40+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Windows_Release|Any CPU.ActiveCfg = Debug|Any CPU
43+
{A8FAF4B3-3B84-4164-AF8A-F808C466A059}.Windows_Release|Any CPU.Build.0 = Debug|Any CPU
44+
EndGlobalSection
45+
GlobalSection(SolutionProperties) = preSolution
46+
HideSolutionNode = FALSE
47+
EndGlobalSection
48+
EndGlobal

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

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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+
</root>

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{FCDAF9E3-2E24-4CD1-9E14-937BDFFC2C7A}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AssemblyName>System.Security.Cryptography.RandomNumberGenerator</AssemblyName>
10+
<AssemblyVersion>4.0.0.0</AssemblyVersion>
11+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
<CLSCompliant>false</CLSCompliant>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU' " />
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU' " />
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU' " />
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU' " />
18+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU' " />
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU' " />
20+
<ItemGroup>
21+
<Compile Include="System\Security\Cryptography\RandomNumberGenerator.cs" />
22+
</ItemGroup>
23+
<ItemGroup Condition=" '$(TargetsWindows)' == 'true' ">
24+
<Compile Include="System\Security\Cryptography\RNGCryptoServiceProvider.Windows.cs" />
25+
<Compile Include="$(CommonPath)\Interop\Windows\BCrypt\Cng.cs">
26+
<Link>Common\Interop\Windows\BCrypt\Cng.cs</Link>
27+
</Compile>
28+
</ItemGroup>
29+
<ItemGroup Condition=" '$(TargetsUnix)' == 'true' ">
30+
<Compile Include="System\Security\Cryptography\RNGCryptoServiceProvider.Unix.cs" />
31+
<Compile Include="$(CommonPath)\Interop\Unix\Interop.Libraries.cs">
32+
<Link>Common\Interop\Unix\Interop.Libraries.cs</Link>
33+
</Compile>
34+
<Compile Include="$(CommonPath)\Interop\Unix\libcoreclr\Interop.EnsureOpenSslInitialized.cs">
35+
<Link>Common\Interop\Unix\libcoreclr\Interop.EnsureOpenSslInitialized.cs</Link>
36+
</Compile>
37+
<Compile Include="$(CommonPath)\Interop\Unix\libcrypto\Interop.ERR.cs">
38+
<Link>Common\Interop\Unix\libcrypto\Interop.ERR.cs</Link>
39+
</Compile>
40+
<Compile Include="$(CommonPath)\Interop\Unix\libcrypto\Interop.Initialization.cs">
41+
<Link>Common\Interop\Unix\libcrypto\Interop.Initialization.cs</Link>
42+
</Compile>
43+
<Compile Include="$(CommonPath)\Interop\Unix\libcrypto\Interop.RAND.cs">
44+
<Link>Common\Interop\Unix\libcrypto\Interop.RAND.cs</Link>
45+
</Compile>
46+
</ItemGroup>
47+
<ItemGroup>
48+
<None Include="project.json" />
49+
</ItemGroup>
50+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
51+
</Project>

‎src/System.Security.Cryptography.RandomNumberGenerator/src/System/Security/Cryptography/RNGCryptoServiceProvider.Unix.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
internal sealed class RNGCryptoServiceProvider : RandomNumberGenerator
7+
{
8+
public sealed override unsafe void GetBytes(byte[] data)
9+
{
10+
ValidateGetBytesArgs(data);
11+
if (data.Length > 0)
12+
{
13+
fixed (byte* buf = data)
14+
{
15+
if (Interop.libcrypto.RAND_pseudo_bytes(buf, data.Length) == -1)
16+
{
17+
throw new CryptographicException();
18+
}
19+
}
20+
}
21+
}
22+
}
23+
}

‎src/System.Security.Cryptography.RandomNumberGenerator/src/System/Security/Cryptography/RNGCryptoServiceProvider.Windows.cs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
6+
using Internal.NativeCrypto;
7+
8+
namespace System.Security.Cryptography
9+
{
10+
internal sealed class RNGCryptoServiceProvider : RandomNumberGenerator
11+
{
12+
public sealed override void GetBytes(byte[] data)
13+
{
14+
ValidateGetBytesArgs(data);
15+
if (data.Length > 0)
16+
{
17+
Cng.BCryptGenRandom(data);
18+
}
19+
}
20+
}
21+
}
22+

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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+
6+
namespace System.Security.Cryptography
7+
{
8+
public abstract class RandomNumberGenerator : IDisposable
9+
{
10+
protected RandomNumberGenerator()
11+
{
12+
}
13+
14+
public static RandomNumberGenerator Create()
15+
{
16+
return new RNGCryptoServiceProvider();
17+
}
18+
19+
public void Dispose()
20+
{
21+
Dispose(true);
22+
GC.SuppressFinalize(this);
23+
return;
24+
}
25+
26+
protected virtual void Dispose(bool disposing)
27+
{
28+
return;
29+
}
30+
31+
public abstract void GetBytes(byte[] data);
32+
33+
internal void ValidateGetBytesArgs(byte[] data)
34+
{
35+
if (data == null)
36+
{
37+
throw new ArgumentNullException("data");
38+
}
39+
}
40+
}
41+
}
42+

‎src/System.Security.Cryptography.RandomNumberGenerator/src/project.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"dependencies": {
3+
"System.Diagnostics.Contracts": "4.0.0-beta-*",
4+
"System.Diagnostics.Debug": "4.0.10-beta-*",
5+
"System.Resources.ResourceManager": "4.0.0-beta-*",
6+
"System.Runtime": "4.0.20-beta-*",
7+
"System.Runtime.InteropServices": "4.0.20-beta-*",
8+
"System.Security.Cryptography.Encoding": "4.0.0-beta-*",
9+
"System.Security.Cryptography.Encryption": "4.0.0-beta-*",
10+
},
11+
"frameworks": {
12+
"dnxcore50": {}
13+
}
14+
}

0 commit comments

Comments
 (0)