From c827518464c933edd6ab72fdb3d89118ee02b6b3 Mon Sep 17 00:00:00 2001 From: Ricardo Biehl Pasquali Date: Mon, 8 Nov 2021 11:16:11 -0300 Subject: [PATCH] Support AsymmetricKeyParameter as return value of ReadPrivateKey() (#882) --- assets/signing/sign-message.bouncycastle.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/assets/signing/sign-message.bouncycastle.cs b/assets/signing/sign-message.bouncycastle.cs index 2efec4f19..6d98fa136 100644 --- a/assets/signing/sign-message.bouncycastle.cs +++ b/assets/signing/sign-message.bouncycastle.cs @@ -43,9 +43,13 @@ string SignMessage(string msg) return Convert.ToBase64String(sig.GenerateSignature()); } -AsymmetricKeyParameter getPrivateKey() { +AsymmetricKeyParameter getPrivateKey() +{ using (var reader = System.IO.File.OpenText(privateKey)) - return (new PemReader(reader, null).ReadObject() as AsymmetricCipherKeyPair).Private; + { + var pem = new PemReader(reader).ReadObject(); + return pem as AsymmetricKeyParameter ?? (pem as AsymmetricCipherKeyPair).Private; + } } @@ -54,7 +58,10 @@ AsymmetricKeyParameter getPrivateKey() { string certificate = "digital-certificate.txt"; -string GetCertificate() { +string GetCertificate() +{ using (var reader = System.IO.File.OpenText(certificate)) + { return reader.ReadToEnd(); + } }