admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 4586 - bouncycastle and also had to do mailkit as it was providing an old version of bounceycastle causing conflict

Browse Source
This commit is contained in:
John Cardinal
2024-05-09 19:53:39 +00:00
parent 13644fc935
commit 7cd16e460f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/AyaNova/AyaNova.csproj
View File

@@ -21,10 +21,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Bogus" Version="35.5.1" /> <PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="BouncyCastle.NetCore" Version="1.9.0" /> <!-- <PackageReference Include="BouncyCastle.NetCore" Version="2.2.1" /> -->
<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
<PackageReference Include="Enums.NET" Version="4.0.0" /> <PackageReference Include="Enums.NET" Version="4.0.0" />
<PackageReference Include="jose-jwt" Version="4.0.0" /> <PackageReference Include="jose-jwt" Version="4.0.0" />
<PackageReference Include="MailKit" Version="3.2.0" /> <PackageReference Include="MailKit" Version="4.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.0.0" />

9
server/AyaNova/util/License.cs
View File

@@ -11,9 +11,12 @@ using System.Linq;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
//JSON KEY
using Org.BouncyCastle.Security; using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.OpenSsl; using Org.BouncyCastle.OpenSsl;
using Org.BouncyCastle.Security;
//JSON KEY
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -963,7 +966,7 @@ EQIDAQAB
PemReader pr = new PemReader(new StringReader(publicPem)); PemReader pr = new PemReader(new StringReader(publicPem));
var KeyParameter = (Org.BouncyCastle.Crypto.AsymmetricKeyParameter)pr.ReadObject(); var KeyParameter = (AsymmetricKeyParameter)pr.ReadObject();
var signer = SignerUtilities.GetSigner("SHA256WITHRSA"); var signer = SignerUtilities.GetSigner("SHA256WITHRSA");
signer.Init(false, KeyParameter); signer.Init(false, KeyParameter);
var expectedSig = Convert.FromBase64String(keySig); var expectedSig = Convert.FromBase64String(keySig);