From dda3c3a123ad410a919f8d2d4e7fc171dba670a5 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 13 Jan 2020 15:35:50 -0500 Subject: [PATCH] Async GetEmbeddedCertificate --- src/Core/Services/Implementations/LicensingService.cs | 3 ++- src/Core/Utilities/CoreHelpers.cs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs index 037c42b656..9c1266d3d3 100644 --- a/src/Core/Services/Implementations/LicensingService.cs +++ b/src/Core/Services/Implementations/LicensingService.cs @@ -46,7 +46,8 @@ namespace Bit.Core.Services "‎B34876439FCDA2846505B2EFBBA6C4A951313EBE"; if(_globalSettings.SelfHosted) { - _certificate = CoreHelpers.GetEmbeddedCertificate("licensing.cer", null); + _certificate = CoreHelpers.GetEmbeddedCertificateAsync("licensing.cer", null) + .GetAwaiter().GetResult(); } else if(CoreHelpers.SettingHasValue(_globalSettings.Storage?.ConnectionString) && CoreHelpers.SettingHasValue(_globalSettings.LicenseCertificatePassword)) diff --git a/src/Core/Utilities/CoreHelpers.cs b/src/Core/Utilities/CoreHelpers.cs index a9652c9f53..971f6407db 100644 --- a/src/Core/Utilities/CoreHelpers.cs +++ b/src/Core/Utilities/CoreHelpers.cs @@ -169,13 +169,13 @@ namespace Bit.Core.Utilities return new X509Certificate2(file, password); } - public static X509Certificate2 GetEmbeddedCertificate(string file, string password) + public async static Task GetEmbeddedCertificateAsync(string file, string password) { var assembly = typeof(CoreHelpers).GetTypeInfo().Assembly; using(var s = assembly.GetManifestResourceStream($"Bit.Core.{file}")) using(var ms = new MemoryStream()) { - s.CopyTo(ms); + await s.CopyToAsync(ms); return new X509Certificate2(ms.ToArray(), password); } }