Skip to content

Commit 0f1a48d

Browse files
committed
Purge use of RNGCryptoServiceProvider in examples
1 parent 6139eea commit 0f1a48d

File tree

31 files changed

+104
-89
lines changed

31 files changed

+104
-89
lines changed

snippets/cpp/VS_Snippets_CLR/Cryptography.PasswordDerivedbytes/cpp/sample.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ array<Byte>^ CreateRandomSalt(int length)
1818
randomBytes = gcnew array <Byte>(1);
1919
}
2020

21-
// Create a new RNGCryptoServiceProvider.
22-
RNGCryptoServiceProvider^ cryptoRNGProvider =
23-
gcnew RNGCryptoServiceProvider();
21+
// Create a new RandomNumberGenerator.
22+
RandomNumberGenerator^ randomNumberGenerator =
23+
RandomNumberGenerator::Create();
2424

2525
// Fill the buffer with random bytes.
26-
cryptoRNGProvider->GetBytes(randomBytes);
26+
randomNumberGenerator->GetBytes(randomBytes);
2727

2828
// return the bytes.
2929
return randomBytes;

snippets/cpp/VS_Snippets_CLR/HMACRIPEMD160/CPP/hmacripemd160.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ int main()
111111
// secret key shared by sender and receiver.
112112
array<Byte>^secretkey = gcnew array<Byte>(64);
113113

114-
//RNGCryptoServiceProvider is an implementation of a random number generator.
115-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
114+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
116115

117116
// The array is now filled with cryptographically strong random bytes.
118117
rng->GetBytes( secretkey );

snippets/cpp/VS_Snippets_CLR/HMACSHA256/CPP/hmacsha256.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ int main()
111111
// secret key shared by sender and receiver.
112112
array<Byte>^secretkey = gcnew array<Byte>(64);
113113

114-
//RNGCryptoServiceProvider is an implementation of a random number generator.
115-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
114+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
116115

117116
// The array is now filled with cryptographically strong random bytes.
118117
rng->GetBytes( secretkey );

snippets/cpp/VS_Snippets_CLR/HMACSHA384/CPP/hmacsha384.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ int main()
111111
// secret key shared by sender and receiver.
112112
array<Byte>^secretkey = gcnew array<Byte>(64);
113113

114-
//RNGCryptoServiceProvider is an implementation of a random number generator.
115-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
114+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
116115

117116
// The array is now filled with cryptographically strong random bytes.
118117
rng->GetBytes( secretkey );

snippets/cpp/VS_Snippets_CLR/HMACSHA512/CPP/hmacsha512.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ int main()
110110
// Create a random key using a random number generator. This would be the
111111
// secret key shared by sender and receiver.
112112
array<Byte>^secretkey = gcnew array<Byte>(64);
113-
114-
//RNGCryptoServiceProvider is an implementation of a random number generator.
115-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
113+
114+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
116115

117116
// The array is now filled with cryptographically strong random bytes.
118117
rng->GetBytes( secretkey );

snippets/cpp/VS_Snippets_CLR/rfc28981/CPP/rfc28981.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ int main()
2727
String^ pwd1 = passwordargs[ 1 ];
2828

2929
array<Byte>^salt1 = gcnew array<Byte>(8);
30-
RNGCryptoServiceProvider ^ rngCsp = gcnew RNGCryptoServiceProvider();
31-
rngCsp->GetBytes(salt1);
30+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
31+
rng->GetBytes(salt1);
3232
//data1 can be a string or contents of a file.
3333
String^ data1 = "Some test data";
3434

snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetBytes Example/CPP/source.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ public ref class Form1: public Form
1616
// <Snippet1>
1717
array<Byte>^ random = gcnew array<Byte>(100);
1818

19-
//RNGCryptoServiceProvider is an implementation of a random number generator.
20-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
19+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
2120
rng->GetBytes( random ); // The array is now filled with cryptographically strong random bytes.
2221
// </Snippet1>
2322
}

snippets/cpp/VS_Snippets_CLR_Classic/classic RandomNumberGenerator.GetNonZeroBytes Example/CPP/source.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public ref class Form1: public Form
1515
{
1616
// <Snippet1>
1717
array<Byte>^ random = gcnew array<Byte>(100);
18-
//RNGCryptoServiceProvider is an implementation of a random number generator.
19-
RNGCryptoServiceProvider^ rng = gcnew RNGCryptoServiceProvider;
18+
RandomNumberGenerator^ rng = RandomNumberGenerator::Create();
2019
rng->GetNonZeroBytes( random ); // The array is now filled with cryptographically strong random bytes, and none are zero.
2120
// </Snippet1>
2221
}

snippets/cpp/VS_Snippets_CLR_System/system.Security.Cryptography.RSAOAEPKeyExchangeDeformatter/CPP/rsaencoder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ ref class RSAEncoder
122122

123123
// Create a random number using the RNGCryptoServiceProvider provider.
124124
//<Snippet6>
125-
RNGCryptoServiceProvider^ ring = gcnew RNGCryptoServiceProvider;
125+
RandomNumberGenerator^ ring = RandomNumberGenerator::Create();
126126
rsaFormatter->Rng = ring;
127127
//</Snippet6>
128128

@@ -190,7 +190,7 @@ int main()
190190
//
191191
// Encoding the following message:
192192
// A phrase to be encoded.
193-
// Resulting message encoded: %?}T:v??xu?eD)YucItjwu¦ALH HB,Uj??2xq?.?s45
193+
// Resulting message encoded: %?}T:v??xu?eD)YucItjwu¦ALH HB,Uj??2xq?.?s45
194194
// ?f?L2?=X?CPzWx???"q5?6&N"AE,Z+T?(]S?_7~,?G{?VV!:S?df?
195195
// Resulting message decoded:
196196
// A phrase to be encoded.

snippets/csharp/System.Security.Cryptography/HMACRIPEMD160/Overview/hmacripemd160.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public static void Main(string[] Fileargs)
3535
// Create a random key using a random number generator. This would be the
3636
// secret key shared by sender and receiver.
3737
byte[] secretkey = new Byte[64];
38-
//RNGCryptoServiceProvider is an implementation of a random number generator.
39-
using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
38+
39+
using (RandomNumberGenerator rng = RandomNumberGenerator.Create())
4040
{
4141
// The array is now filled with cryptographically strong random bytes.
4242
rng.GetBytes(secretkey);

0 commit comments

Comments
 (0)