charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 19:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Namespace BouncyCastle lib to avoid conflicts (#3843)

Browse Source 
This uses our fork https://github.com/MirrorNetworking/bc-csharp with the Mirror. prefix
dll is generated by CI: https://github.com/MirrorNetworking/bc-csharp/actions/runs/9582807523 so updating in the future should be as "easy" as rebasing on bouncycastle release branches, fixing any naming via search&replace and making a release to trigger CI
This commit is contained in:
Robin Rolf 2024-06-19 13:53:02 +00:00 committed by MrGadget
parent fc564507f5
commit 37cae8ea79
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll
View File

Binary file not shown.

2
Assets/Mirror/Plugins/BouncyCastle/LICENSE.md
View File

@ -1,3 +1,5 @@
Version with renamed namespaces to avoid conflicts lives here: https://github.com/MirrorNetworking/bc-csharp
Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org). Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction, associated documentation files (the "Software"), to deal in the Software without restriction,

BIN
Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll Normal file
View File

Binary file not shown.

0
Assets/Mirror/Plugins/BouncyCastle/BouncyCastle.Cryptography.dll.meta → Assets/Mirror/Plugins/BouncyCastle/Mirror.BouncyCastle.Cryptography.dll.meta
View File

12
Assets/Mirror/Transports/Encryption/EncryptedConnection.cs
View File

@ -1,12 +1,12 @@
using System; using System;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using Org.BouncyCastle.Crypto; using Mirror.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Agreement; using Mirror.BouncyCastle.Crypto.Agreement;
using Org.BouncyCastle.Crypto.Digests; using Mirror.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Generators; using Mirror.BouncyCastle.Crypto.Generators;
using Org.BouncyCastle.Crypto.Modes; using Mirror.BouncyCastle.Crypto.Modes;
using Org.BouncyCastle.Crypto.Parameters; using Mirror.BouncyCastle.Crypto.Parameters;
using UnityEngine.Profiling; using UnityEngine.Profiling;
namespace Mirror.Transports.Encryption namespace Mirror.Transports.Encryption

18
Assets/Mirror/Transports/Encryption/EncryptionCredentials.cs
View File

@ -1,14 +1,14 @@
using System; using System;
using System.IO; using System.IO;
using Org.BouncyCastle.Asn1.Pkcs; using Mirror.BouncyCastle.Asn1.Pkcs;
using Org.BouncyCastle.Asn1.X509; using Mirror.BouncyCastle.Asn1.X509;
using Org.BouncyCastle.Crypto; using Mirror.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Digests; using Mirror.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Generators; using Mirror.BouncyCastle.Crypto.Generators;
using Org.BouncyCastle.X509; using Mirror.BouncyCastle.X509;
using Org.BouncyCastle.Crypto.Parameters; using Mirror.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Pkcs; using Mirror.BouncyCastle.Pkcs;
using Org.BouncyCastle.Security; using Mirror.BouncyCastle.Security;
using UnityEngine; using UnityEngine;
namespace Mirror.Transports.Encryption namespace Mirror.Transports.Encryption

2
Assets/Mirror/Transports/Encryption/PubKeyInfo.cs
View File

@ -1,5 +1,5 @@
using System; using System;
using Org.BouncyCastle.Crypto; using Mirror.BouncyCastle.Crypto;
public struct PubKeyInfo public struct PubKeyInfo
{ {