Skip to content

Commit 991be5f

Browse files
committed
Merge branch 'master' into publish-25298
2 parents 0ac45de + 504ccd3 commit 991be5f

File tree

49 files changed

+364
-1585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+364
-1585
lines changed

samples/snippets/cpp/VS_Snippets_CLR/Cryptography.DataProtectionSample/CPP/dataprotectionsample.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public ref class DataProtectionSample
99
private:
1010

1111
// Create byte array for additional entropy when using Protect method.
12-
static array<Byte>^s_aditionalEntropy = {9,8,7,6,5};
12+
static array<Byte>^s_additionalEntropy = {9,8,7,6,5};
1313

1414
public:
1515
static void Main()
@@ -36,7 +36,7 @@ public ref class DataProtectionSample
3636

3737
// Encrypt the data using DataProtectionScope.CurrentUser. The result can be decrypted
3838
// only by the same current user.
39-
return ProtectedData::Protect( data, s_aditionalEntropy, DataProtectionScope::CurrentUser );
39+
return ProtectedData::Protect( data, s_additionalEntropy, DataProtectionScope::CurrentUser );
4040
}
4141
catch ( CryptographicException^ e )
4242
{
@@ -52,7 +52,7 @@ public ref class DataProtectionSample
5252
{
5353

5454
//Decrypt the data using DataProtectionScope.CurrentUser.
55-
return ProtectedData::Unprotect( data, s_aditionalEntropy, DataProtectionScope::CurrentUser );
55+
return ProtectedData::Unprotect( data, s_additionalEntropy, DataProtectionScope::CurrentUser );
5656
}
5757
catch ( CryptographicException^ e )
5858
{

samples/snippets/cpp/VS_Snippets_CLR/HMACMD5/CPP/hmacmd5.cpp

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

samples/snippets/cpp/VS_Snippets_CLR/HMACSHA1/CPP/hmacsha1.cpp

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

samples/snippets/cpp/VS_Snippets_CLR_Classic/classic Hash.MD5 Example/CPP/source.cpp

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

samples/snippets/cpp/VS_Snippets_CLR_Classic/classic MD5CryptoServiceProvider Example/CPP/source.cpp

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

samples/snippets/cpp/VS_Snippets_CLR_Classic/classic SHA1 Example/CPP/source.cpp

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

0 commit comments

Comments
 (0)