mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.0.0.293

Browse Source 
Former-commit-id: c73c6d59ea27405c8ec2975fc933d2a9a447e603
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-06-08 08:45:03 +00:00
parent 7de0679779
commit 76c6505a64
70 changed files with 132 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/tools/security/Makefile
View File

@@ -4,7 +4,7 @@ DIST_ONLY_SUBDIRS = certview
include ../../build/rules.make
LOCAL_MCS_FLAGS =
LIB_REFS = Mono.Security System
LIB_REFS = Mono.Security System System.Core
SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe makecert.exe chktrust.exe crlupdate.exe \
signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe mozroots.exe cert-sync.exe
@@ -66,4 +66,4 @@ permview.exe: permview.cs
$(CSCOMPILE) $^ $(HELPER_SOURCES) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Cecil.dll
%.exe: %.cs $(HELPER_SOURCES)
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll $^
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/Mono.Security.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Core.dll $^

3
mcs/tools/security/httpcfg.cs
View File

@@ -202,7 +202,8 @@ namespace Mono.Tools {
{
try {
X509Certificate2 x509 = new X509Certificate2 (cert);
x509.PrivateKey = PrivateKey.CreateFromFile (pvk).RSA;
var privateKey = PrivateKey.CreateFromFile (pvk).RSA;
x509 = x509.CopyWithPrivateKey ((RSA)privateKey);
} catch (Exception e) {
Console.Error.WriteLine ("error loading certificate or private key [{0}]", e.Message);
Help (true);