huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use the factory method to create RNG

This commit is contained in:
anurse 2015-06-29 12:39:57 -07:00
parent 1c50ec7166
commit f65ad82c6b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNet.WebSockets.Protocol/CommonWebSocket.cs
View File

@ -6,6 +6,7 @@ using System.Diagnostics.Contracts;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.WebSockets; using System.Net.WebSockets;
using System.Security.Cryptography;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -16,6 +17,7 @@ namespace Microsoft.AspNet.WebSockets.Protocol
public class CommonWebSocket : WebSocket public class CommonWebSocket : WebSocket
{ {
private readonly static byte[] PingBuffer = Encoding.ASCII.GetBytes("abcdefghijklmnopqrstuvwxyz"); private readonly static byte[] PingBuffer = Encoding.ASCII.GetBytes("abcdefghijklmnopqrstuvwxyz");
private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
private readonly Stream _stream; private readonly Stream _stream;
private readonly string _subProtocl; private readonly string _subProtocl;
@ -100,10 +102,6 @@ namespace Microsoft.AspNet.WebSockets.Protocol
// the bytes that appear on the wire. RFC 4086 [RFC4086] discusses what // the bytes that appear on the wire. RFC 4086 [RFC4086] discusses what
// entails a suitable source of entropy for security-sensitive // entails a suitable source of entropy for security-sensitive
// applications. // applications.
#if NET45
// Normally we don't group methods and fields like this but I want to centralize the #if :)
// Same for using full namespace names.
private static readonly System.Security.Cryptography.RandomNumberGenerator _rng = new System.Security.Cryptography.RNGCryptoServiceProvider();
private int GetNextMask() private int GetNextMask()
{ {
if (_useZeroMask) if (_useZeroMask)
@ -116,12 +114,6 @@ namespace Microsoft.AspNet.WebSockets.Protocol
_rng.GetBytes(buffer); _rng.GetBytes(buffer);
return BitConverter.ToInt32(buffer, 0); return BitConverter.ToInt32(buffer, 0);
} }
#else
private int GetNextMask()
{
throw new PlatformNotSupportedException("The WebSocket client is not supported on this platform.");
}
#endif
public override async Task SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken) public override async Task SendAsync(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken cancellationToken)
{ {

1
src/Microsoft.AspNet.WebSockets.Protocol/project.json
View File

@ -18,6 +18,7 @@
"System.Security.Cryptography.Encryption": "4.0.0-beta-*", "System.Security.Cryptography.Encryption": "4.0.0-beta-*",
"System.Security.Cryptography.Hashing": "4.0.0-beta-*", "System.Security.Cryptography.Hashing": "4.0.0-beta-*",
"System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*", "System.Security.Cryptography.Hashing.Algorithms": "4.0.0-beta-*",
"System.Security.Cryptography.RandomNumberGenerator": "4.0.0-beta-*",
"System.Text.Encoding.Extensions": "4.0.10-beta-*", "System.Text.Encoding.Extensions": "4.0.10-beta-*",
"System.Threading": "4.0.10-beta-*", "System.Threading": "4.0.10-beta-*",
"System.Threading.Tasks": "4.0.10-beta-*", "System.Threading.Tasks": "4.0.10-beta-*",