ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 15:43:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1505 from corda/anthony-os-merge-2018-10-24

Browse Source 
O/S Merge 24/10/2018
This commit is contained in:
Anthony Keenan
2018-10-28 21:43:52 +00:00
committed by GitHub
parent 75aae261bd 5ac6e1030e
commit 2ef1f1c7c4
130 changed files with 2802 additions and 1382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/KeyStoreConfigHelpers.kt
View File

@ -99,6 +99,8 @@ const val DEV_CA_TRUST_STORE_FILE: String = "cordatruststore.jks"
const val DEV_CA_TRUST_STORE_PASS: String = "trustpass"
const val DEV_CA_TRUST_STORE_PRIVATE_KEY_PASS: String = "trustpasskeypass"
val DEV_CERTIFICATES: List<X509Certificate> get() = listOf(DEV_INTERMEDIATE_CA.certificate, DEV_ROOT_CA.certificate)
// We need a class so that we can get hold of the class loader
internal object DevCaHelper {
fun loadDevCa(alias: String): CertificateAndKeyPair {

2
node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt
View File

@ -65,7 +65,7 @@ internal constructor(private val initSerEnv: Boolean,
"java",
"-jar",
"corda.jar",
"--just-generate-node-info"
"generate-node-info"
)
private const val LOGS_DIR_NAME = "logs"