You've already forked linux-packaging-mono
Imported Upstream version 5.20.0.180
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
parent
0e2d47d1c8
commit
0510252385
@@ -24,6 +24,12 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
#if SECURITY_DEP && MONO_FEATURE_BTLS
|
||||
#if MONO_SECURITY_ALIAS
|
||||
extern alias MonoSecurity;
|
||||
using MX = MonoSecurity::Mono.Security.Cryptography;
|
||||
#else
|
||||
using MX = Mono.Security.Cryptography;
|
||||
#endif
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
@@ -109,7 +115,7 @@ namespace Mono.Btls
|
||||
|
||||
public static MonoBtlsKey CreateFromRSAPrivateKey (System.Security.Cryptography.RSA privateKey)
|
||||
{
|
||||
var keyData = Mono.Security.Cryptography.PKCS8.PrivateKeyInfo.Encode (privateKey);
|
||||
var keyData = MX.PKCS8.PrivateKeyInfo.Encode (privateKey);
|
||||
var key = new MonoBtlsKey (new BoringKeyHandle (mono_btls_key_new ()));
|
||||
|
||||
var ret = mono_btls_key_assign_rsa_private_key (key.Handle.DangerousGetHandle (), keyData, keyData.Length);
|
||||
|
||||
@@ -30,8 +30,10 @@ extern alias MonoSecurity;
|
||||
|
||||
#if MONO_SECURITY_ALIAS
|
||||
using MX = MonoSecurity::Mono.Security.X509;
|
||||
using MonoSecurity::Mono.Security.Cryptography;
|
||||
#else
|
||||
using MX = Mono.Security.X509;
|
||||
using Mono.Security.Cryptography;
|
||||
#endif
|
||||
|
||||
using System;
|
||||
@@ -41,7 +43,6 @@ using System.Security;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Runtime.InteropServices;
|
||||
using Mono.Security.Cryptography;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
|
||||
namespace Mono.Btls
|
||||
|
||||
@@ -24,13 +24,18 @@
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
// THE SOFTWARE.
|
||||
#if SECURITY_DEP && MONO_FEATURE_BTLS
|
||||
#if MONO_SECURITY_ALIAS
|
||||
extern alias MonoSecurity;
|
||||
using MX = MonoSecurity::Mono.Security.X509;
|
||||
#else
|
||||
using MX = Mono.Security.X509;
|
||||
#endif
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Security;
|
||||
using System.Security.Cryptography;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using MX = Mono.Security.X509;
|
||||
|
||||
namespace Mono.Btls
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user