Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -40,6 +40,7 @@ install-local: $(SECURITY_TARGETS)
for p in $(SECURITY_TARGETS) ; do \
$(INSTALL_BIN) $$p $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
test ! -f $$p.mdb || $(INSTALL_BIN) $$p.mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
test ! -f $${p%.exe}.pdb || $(INSTALL_BIN) $${p%.exe}.pdb $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
done
uninstall-local:

View File

@@ -119,15 +119,19 @@ namespace Mono.Tools
if (userStore) {
WriteLine ("Importing into legacy user store:");
ImportToStore (roots, X509StoreManager.CurrentUser.TrustedRoot);
WriteLine ("");
WriteLine ("Importing into BTLS user store:");
ImportToStore (roots, X509StoreManager.NewCurrentUser.TrustedRoot);
if (Mono.Security.Interface.MonoTlsProviderFactory.IsProviderSupported ("btls")) {
WriteLine ("");
WriteLine ("Importing into BTLS user store:");
ImportToStore (roots, X509StoreManager.NewCurrentUser.TrustedRoot);
}
} else {
WriteLine ("Importing into legacy system store:");
ImportToStore (roots, X509StoreManager.LocalMachine.TrustedRoot);
WriteLine ("");
WriteLine ("Importing into BTLS system store:");
ImportToStore (roots, X509StoreManager.NewLocalMachine.TrustedRoot);
if (Mono.Security.Interface.MonoTlsProviderFactory.IsProviderSupported ("btls")) {
WriteLine ("");
WriteLine ("Importing into BTLS system store:");
ImportToStore (roots, X509StoreManager.NewLocalMachine.TrustedRoot);
}
}
return 0;

View File

@@ -195,7 +195,7 @@ namespace Mono.Tools {
return signed;
}
Console.WriteLine ("Couldn't sign the assembly {0} with this key pair.", assemblyName);
Console.WriteLine ("Couldn't sign the assembly {0} with this key pair. Public key of assembly did not match signing public key.", assemblyName);
return false;
}