From 402960f1019062f5dbae22ac927c62829283f62e Mon Sep 17 00:00:00 2001 From: Zachary Becknell Date: Thu, 6 Aug 2020 13:05:22 -0400 Subject: [PATCH] Fix deadlock when using AzureKeyVaultXmlEncryptor.Encrypt (sync) from .NET Framework (#12605) --- .../src/AzureKeyVaultXmlDecryptor.cs | 2 +- .../src/AzureKeyVaultXmlEncryptor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlDecryptor.cs b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlDecryptor.cs index e8f9829781f35..b3fe150878f5f 100644 --- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlDecryptor.cs +++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlDecryptor.cs @@ -24,7 +24,7 @@ public AzureKeyVaultXmlDecryptor(IServiceProvider serviceProvider) public XElement Decrypt(XElement encryptedElement) { - return DecryptAsync(encryptedElement).GetAwaiter().GetResult(); + return Task.Run(() => DecryptAsync(encryptedElement)).GetAwaiter().GetResult(); } private async Task DecryptAsync(XElement encryptedElement) diff --git a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlEncryptor.cs b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlEncryptor.cs index d818dae8214d4..38ce7ae45662f 100644 --- a/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlEncryptor.cs +++ b/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Keys/src/AzureKeyVaultXmlEncryptor.cs @@ -36,7 +36,7 @@ internal AzureKeyVaultXmlEncryptor(IKeyEncryptionKeyResolver client, string keyI public EncryptedXmlInfo Encrypt(XElement plaintextElement) { - return EncryptAsync(plaintextElement).GetAwaiter().GetResult(); + return Task.Run(() => EncryptAsync(plaintextElement)).GetAwaiter().GetResult(); } private async Task EncryptAsync(XElement plaintextElement)