Skip to content

Commit c26c855

Browse files
Pilchiewtgodbe
Pilchie
authored and
wtgodbe
committed
resolve conflicts
1 parent 9041b5d commit c26c855

18 files changed

+152
-144
lines changed

‎src/Components/test/E2ETest/Tests/WebAssemblyAuthenticationTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void AnonymousUser_GetsRedirectedToLogin_AndBackToOriginalProtectedResour
7878
ClickAndNavigate(link, page);
7979

8080
var userName = $"{Guid.NewGuid()}@example.com";
81-
var password = $"!Test.Password1$";
81+
var password = $"[PLACEHOLDER]-1a";
8282

8383
FirstTimeRegister(userName, password);
8484

@@ -96,7 +96,7 @@ public void CanPreserveApplicationState_DuringLogIn()
9696
ClickAndNavigate(link, page);
9797

9898
var userName = $"{Guid.NewGuid()}@example.com";
99-
var password = $"!Test.Password1$";
99+
var password = $"[PLACEHOLDER]-1a";
100100

101101
FirstTimeRegister(userName, password);
102102

@@ -116,7 +116,7 @@ public void CanShareUserRolesBetweenClientAndServer()
116116
ClickAndNavigate(By.PartialLinkText("Log in"), "/Identity/Account/Login");
117117

118118
var userName = $"{Guid.NewGuid()}@example.com";
119-
var password = $"!Test.Password1$";
119+
var password = $"[PLACEHOLDER]-1a";
120120
FirstTimeRegister(userName, password);
121121

122122
ClickAndNavigate(By.PartialLinkText("Make admin"), "/new-admin");
@@ -141,7 +141,7 @@ public void AnonymousUser_CanRegister_AndGetLoggedIn()
141141
ClickAndNavigate(By.PartialLinkText("Register"), "/Identity/Account/Register");
142142

143143
var userName = $"{Guid.NewGuid()}@example.com";
144-
var password = $"!Test.Password1$";
144+
var password = $"[PLACEHOLDER]-1a";
145145
RegisterCore(userName, password);
146146
CompleteProfileDetails();
147147

@@ -158,7 +158,7 @@ public void AuthenticatedUser_ProfileIncludesDetails_And_AccessToken()
158158
ClickAndNavigate(By.PartialLinkText("User"), "/Identity/Account/Login");
159159

160160
var userName = $"{Guid.NewGuid()}@example.com";
161-
var password = $"!Test.Password1$";
161+
var password = $"[PLACEHOLDER]-1a";
162162
FirstTimeRegister(userName, password);
163163

164164
Browser.Contains("user", () => Browser.Url);
@@ -213,7 +213,7 @@ public void AuthenticatedUser_CanGoToProfile()
213213
ClickAndNavigate(By.PartialLinkText("Register"), "/Identity/Account/Register");
214214

215215
var userName = $"{Guid.NewGuid()}@example.com";
216-
var password = $"!Test.Password1$";
216+
var password = $"[PLACEHOLDER]-1a";
217217
RegisterCore(userName, password);
218218
CompleteProfileDetails();
219219

@@ -255,7 +255,7 @@ public void NewlyRegisteredUser_CanLogOut()
255255
ClickAndNavigate(By.PartialLinkText("Register"), "/Identity/Account/Register");
256256

257257
var userName = $"{Guid.NewGuid()}@example.com";
258-
var password = $"!Test.Password1$";
258+
var password = $"[PLACEHOLDER]-1a";
259259
RegisterCore(userName, password);
260260
CompleteProfileDetails();
261261

@@ -268,7 +268,7 @@ public void AlreadyRegisteredUser_CanLogOut()
268268
ClickAndNavigate(By.PartialLinkText("Register"), "/Identity/Account/Register");
269269

270270
var userName = $"{Guid.NewGuid()}@example.com";
271-
var password = $"!Test.Password1$";
271+
var password = $"[PLACEHOLDER]-1a";
272272
RegisterCore(userName, password);
273273
CompleteProfileDetails();
274274

@@ -294,7 +294,7 @@ public void LoggedInUser_OnTheIdP_CanLogInSilently()
294294
ClickAndNavigate(By.PartialLinkText("Register"), "/Identity/Account/Register");
295295

296296
var userName = $"{Guid.NewGuid()}@example.com";
297-
var password = $"!Test.Password1$";
297+
var password = $"[PLACEHOLDER]-1a";
298298
RegisterCore(userName, password);
299299
CompleteProfileDetails();
300300
ValidateLoggedIn(userName);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializerTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Text;
56
using System.Xml.Linq;
67
using Microsoft.AspNetCore.DataProtection.KeyManagement;
78
using Microsoft.Extensions.Logging.Abstractions;
@@ -15,20 +16,21 @@ public class AuthenticatedEncryptorDescriptorDeserializerTests
1516
public void ImportFromXml_Cbc_CreatesAppropriateDescriptor()
1617
{
1718
// Arrange
19+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
1820
var descriptor = new AuthenticatedEncryptorDescriptor(
1921
new AuthenticatedEncryptorConfiguration()
2022
{
2123
EncryptionAlgorithm = EncryptionAlgorithm.AES_192_CBC,
2224
ValidationAlgorithm = ValidationAlgorithm.HMACSHA512
2325
},
24-
"k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret());
26+
masterKey.ToSecret());
2527
var control = CreateEncryptorInstanceFromDescriptor(descriptor);
2628

27-
const string xml = @"
29+
var xml = $@"
2830
<encryptor version='1' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
2931
<encryption algorithm='AES_192_CBC' />
3032
<validation algorithm='HMACSHA512' />
31-
<masterKey enc:requiresEncryption='true'>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</masterKey>
33+
<masterKey enc:requiresEncryption='true'>{masterKey}</masterKey>
3234
</encryptor>";
3335
var deserializedDescriptor = new AuthenticatedEncryptorDescriptorDeserializer().ImportFromXml(XElement.Parse(xml));
3436
var test = CreateEncryptorInstanceFromDescriptor(deserializedDescriptor as AuthenticatedEncryptorDescriptor);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System;
55
using System.Globalization;
66
using System.Security.Cryptography;
7+
using System.Text;
78
using System.Text.RegularExpressions;
89
using Microsoft.AspNetCore.Cryptography.Cng;
910
using Microsoft.AspNetCore.Cryptography.SafeHandles;
@@ -118,20 +119,20 @@ public void CreateAuthenticatedEncryptor_RoundTripsData_ManagedImplementation(
118119
public void ExportToXml_ProducesCorrectPayload_Cbc()
119120
{
120121
// Arrange
121-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
122-
var descriptor = CreateDescriptor(EncryptionAlgorithm.AES_192_CBC, ValidationAlgorithm.HMACSHA512, masterKey);
122+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
123+
var descriptor = CreateDescriptor(EncryptionAlgorithm.AES_192_CBC, ValidationAlgorithm.HMACSHA512, masterKey.ToSecret());
123124

124125
// Act
125126
var retVal = descriptor.ExportToXml();
126127

127128
// Assert
128129
Assert.Equal(typeof(AuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
129-
const string expectedXml = @"
130+
var expectedXml = $@"
130131
<descriptor>
131132
<encryption algorithm='AES_192_CBC' />
132133
<validation algorithm='HMACSHA512' />
133134
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
134-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
135+
<value>{masterKey}</value>
135136
</masterKey>
136137
</descriptor>";
137138
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);
@@ -141,20 +142,20 @@ public void ExportToXml_ProducesCorrectPayload_Cbc()
141142
public void ExportToXml_ProducesCorrectPayload_Gcm()
142143
{
143144
// Arrange
144-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
145-
var descriptor = CreateDescriptor(EncryptionAlgorithm.AES_192_GCM, ValidationAlgorithm.HMACSHA512, masterKey);
145+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
146+
var descriptor = CreateDescriptor(EncryptionAlgorithm.AES_192_GCM, ValidationAlgorithm.HMACSHA512, masterKey.ToSecret());
146147

147148
// Act
148149
var retVal = descriptor.ExportToXml();
149150

150151
// Assert
151152
Assert.Equal(typeof(AuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
152-
const string expectedXml = @"
153+
var expectedXml = $@"
153154
<descriptor>
154155
<encryption algorithm='AES_192_GCM' />
155156
<!-- some comment here -->
156157
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
157-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
158+
<value>{masterKey}</value>
158159
</masterKey>
159160
</descriptor>";
160161
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Text;
56
using System.Xml.Linq;
67
using Microsoft.AspNetCore.Cryptography;
78
using Microsoft.AspNetCore.DataProtection.KeyManagement;
@@ -18,6 +19,7 @@ public class CngCbcAuthenticatedEncryptorDescriptorDeserializerTests
1819
[ConditionalRunTestOnlyOnWindows]
1920
public void ImportFromXml_CreatesAppropriateDescriptor()
2021
{
22+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
2123
// Arrange
2224
var descriptor = new CngCbcAuthenticatedEncryptorDescriptor(
2325
new CngCbcAuthenticatedEncryptorConfiguration()
@@ -28,14 +30,14 @@ public void ImportFromXml_CreatesAppropriateDescriptor()
2830
HashAlgorithm = Constants.BCRYPT_SHA512_ALGORITHM,
2931
HashAlgorithmProvider = null
3032
},
31-
"k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret());
33+
masterKey.ToSecret());
3234
var control = CreateEncryptorInstanceFromDescriptor(descriptor);
3335

34-
const string xml = @"
36+
var xml = $@"
3537
<descriptor version='1' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
3638
<encryption algorithm='AES' keyLength='192' />
3739
<hash algorithm='SHA512' />
38-
<masterKey enc:requiresEncryption='true'>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</masterKey>
40+
<masterKey enc:requiresEncryption='true'>{masterKey}</masterKey>
3941
</descriptor>";
4042
var deserializedDescriptor = new CngCbcAuthenticatedEncryptorDescriptorDeserializer().ImportFromXml(XElement.Parse(xml));
4143
var test = CreateEncryptorInstanceFromDescriptor(deserializedDescriptor as CngCbcAuthenticatedEncryptorDescriptor);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Text;
56
using Xunit;
67

78
namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel
@@ -12,27 +13,27 @@ public class CngCbcAuthenticatedEncryptorDescriptorTests
1213
public void ExportToXml_WithProviders_ProducesCorrectPayload()
1314
{
1415
// Arrange
15-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
16+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
1617
var descriptor = new CngCbcAuthenticatedEncryptorDescriptor(new CngCbcAuthenticatedEncryptorConfiguration()
1718
{
1819
EncryptionAlgorithm = "enc-alg",
1920
EncryptionAlgorithmKeySize = 2048,
2021
EncryptionAlgorithmProvider = "enc-alg-prov",
2122
HashAlgorithm = "hash-alg",
2223
HashAlgorithmProvider = "hash-alg-prov"
23-
}, masterKey);
24+
}, masterKey.ToSecret());
2425

2526
// Act
2627
var retVal = descriptor.ExportToXml();
2728

2829
// Assert
2930
Assert.Equal(typeof(CngCbcAuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
30-
const string expectedXml = @"
31+
var expectedXml = $@"
3132
<descriptor>
3233
<encryption algorithm='enc-alg' keyLength='2048' provider='enc-alg-prov' />
3334
<hash algorithm='hash-alg' provider='hash-alg-prov' />
3435
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
35-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
36+
<value>{masterKey}</value>
3637
</masterKey>
3738
</descriptor>";
3839
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);
@@ -42,25 +43,25 @@ public void ExportToXml_WithProviders_ProducesCorrectPayload()
4243
public void ExportToXml_WithoutProviders_ProducesCorrectPayload()
4344
{
4445
// Arrange
45-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
46+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
4647
var descriptor = new CngCbcAuthenticatedEncryptorDescriptor(new CngCbcAuthenticatedEncryptorConfiguration()
4748
{
4849
EncryptionAlgorithm = "enc-alg",
4950
EncryptionAlgorithmKeySize = 2048,
5051
HashAlgorithm = "hash-alg"
51-
}, masterKey);
52+
}, masterKey.ToSecret());
5253

5354
// Act
5455
var retVal = descriptor.ExportToXml();
5556

5657
// Assert
5758
Assert.Equal(typeof(CngCbcAuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
58-
const string expectedXml = @"
59+
var expectedXml = $@"
5960
<descriptor>
6061
<encryption algorithm='enc-alg' keyLength='2048' />
6162
<hash algorithm='hash-alg' />
6263
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
63-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
64+
<value>{masterKey}</value>
6465
</masterKey>
6566
</descriptor>";
6667
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Text;
56
using System.Xml.Linq;
67
using Microsoft.AspNetCore.Cryptography;
78
using Microsoft.AspNetCore.DataProtection.KeyManagement;
@@ -19,20 +20,21 @@ public class CngGcmAuthenticatedEncryptorDescriptorDeserializerTests
1920
public void ImportFromXml_CreatesAppropriateDescriptor()
2021
{
2122
// Arrange
23+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
2224
var descriptor = new CngGcmAuthenticatedEncryptorDescriptor(
2325
new CngGcmAuthenticatedEncryptorConfiguration()
2426
{
2527
EncryptionAlgorithm = Constants.BCRYPT_AES_ALGORITHM,
2628
EncryptionAlgorithmKeySize = 192,
2729
EncryptionAlgorithmProvider = null
2830
},
29-
"k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret());
31+
masterKey.ToSecret());
3032
var control = CreateEncryptorInstanceFromDescriptor(descriptor);
3133

32-
const string xml = @"
34+
var xml = $@"
3335
<descriptor version='1' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
3436
<encryption algorithm='AES' keyLength='192' />
35-
<masterKey enc:requiresEncryption='true'>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</masterKey>
37+
<masterKey enc:requiresEncryption='true'>{masterKey}</masterKey>
3638
</descriptor>";
3739
var deserializedDescriptor = new CngGcmAuthenticatedEncryptorDescriptorDeserializer().ImportFromXml(XElement.Parse(xml));
3840
var test = CreateEncryptorInstanceFromDescriptor(deserializedDescriptor as CngGcmAuthenticatedEncryptorDescriptor);

‎src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorTests.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
5+
using System.Text;
56
using Xunit;
67

78
namespace Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel
@@ -12,24 +13,24 @@ public class CngGcmAuthenticatedEncryptorDescriptorTests
1213
public void ExportToXml_WithProviders_ProducesCorrectPayload()
1314
{
1415
// Arrange
15-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
16+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
1617
var descriptor = new CngGcmAuthenticatedEncryptorDescriptor(new CngGcmAuthenticatedEncryptorConfiguration()
1718
{
1819
EncryptionAlgorithm = "enc-alg",
1920
EncryptionAlgorithmKeySize = 2048,
2021
EncryptionAlgorithmProvider = "enc-alg-prov"
21-
}, masterKey);
22+
}, masterKey.ToSecret());
2223

2324
// Act
2425
var retVal = descriptor.ExportToXml();
2526

2627
// Assert
2728
Assert.Equal(typeof(CngGcmAuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
28-
const string expectedXml = @"
29+
var expectedXml = $@"
2930
<descriptor>
3031
<encryption algorithm='enc-alg' keyLength='2048' provider='enc-alg-prov' />
3132
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
32-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
33+
<value>{masterKey}</value>
3334
</masterKey>
3435
</descriptor>";
3536
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);
@@ -39,23 +40,23 @@ public void ExportToXml_WithProviders_ProducesCorrectPayload()
3940
public void ExportToXml_WithoutProviders_ProducesCorrectPayload()
4041
{
4142
// Arrange
42-
var masterKey = "k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==".ToSecret();
43+
var masterKey = Convert.ToBase64String(Encoding.UTF8.GetBytes("[PLACEHOLDER]"));
4344
var descriptor = new CngGcmAuthenticatedEncryptorDescriptor(new CngGcmAuthenticatedEncryptorConfiguration()
4445
{
4546
EncryptionAlgorithm = "enc-alg",
4647
EncryptionAlgorithmKeySize = 2048
47-
}, masterKey);
48+
}, masterKey.ToSecret());
4849

4950
// Act
5051
var retVal = descriptor.ExportToXml();
5152

5253
// Assert
5354
Assert.Equal(typeof(CngGcmAuthenticatedEncryptorDescriptorDeserializer), retVal.DeserializerType);
54-
const string expectedXml = @"
55+
var expectedXml = $@"
5556
<descriptor>
5657
<encryption algorithm='enc-alg' keyLength='2048' />
5758
<masterKey enc:requiresEncryption='true' xmlns:enc='http://schemas.asp.net/2015/03/dataProtection'>
58-
<value>k88VrwGLINfVAqzlAp7U4EAjdlmUG17c756McQGdjHU8Ajkfc/A3YOKdqlMcF6dXaIxATED+g2f62wkRRRRRzA==</value>
59+
<value>{masterKey}</value>
5960
</masterKey>
6061
</descriptor>";
6162
XmlAssert.Equal(expectedXml, retVal.SerializedDescriptorElement);

0 commit comments

Comments
 (0)