ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 23:54:07 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-1439: Refactor DelegatingSercureRandomService for modularity. (#590)

Browse Source 
* Refactor DelegatingSercureRandomService so that it can be removed cleanly from the deterministic core module.
* Rename SecureRandom implementation class.
This commit is contained in:
Chris Rankin 2018-03-21 15:31:37 +00:00 committed by GitHub
parent 50d9a7edb3
commit db2cdda020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/kotlin/net/corda/core/crypto/CordaSecurityProvider.kt
View File

@ -12,10 +12,10 @@ package net.corda.core.crypto
import net.corda.core.crypto.CordaObjectIdentifier.COMPOSITE_KEY import net.corda.core.crypto.CordaObjectIdentifier.COMPOSITE_KEY
import net.corda.core.crypto.CordaObjectIdentifier.COMPOSITE_SIGNATURE import net.corda.core.crypto.CordaObjectIdentifier.COMPOSITE_SIGNATURE
import org.bouncycastle.asn1.ASN1ObjectIdentifier
import java.security.Provider
import io.netty.util.concurrent.FastThreadLocal
import net.corda.core.internal.VisibleForTesting import net.corda.core.internal.VisibleForTesting
import org.bouncycastle.asn1.ASN1ObjectIdentifier
import io.netty.util.concurrent.FastThreadLocal
import java.security.Provider
import java.security.SecureRandom import java.security.SecureRandom
import java.security.SecureRandomSpi import java.security.SecureRandomSpi
@ -33,11 +33,12 @@ class CordaSecurityProvider : Provider(PROVIDER_NAME, 0.1, "$PROVIDER_NAME secur
put("Alg.Alias.KeyFactory.OID.$COMPOSITE_KEY", CompositeKey.KEY_ALGORITHM) put("Alg.Alias.KeyFactory.OID.$COMPOSITE_KEY", CompositeKey.KEY_ALGORITHM)
put("Alg.Alias.Signature.$COMPOSITE_SIGNATURE", CompositeSignature.SIGNATURE_ALGORITHM) put("Alg.Alias.Signature.$COMPOSITE_SIGNATURE", CompositeSignature.SIGNATURE_ALGORITHM)
put("Alg.Alias.Signature.OID.$COMPOSITE_SIGNATURE", CompositeSignature.SIGNATURE_ALGORITHM) put("Alg.Alias.Signature.OID.$COMPOSITE_SIGNATURE", CompositeSignature.SIGNATURE_ALGORITHM)
setSecureRandomService()
}
private fun setSecureRandomService() {
// Assuming this Provider is the first SecureRandom Provider, this algorithm is the SecureRandom default: // Assuming this Provider is the first SecureRandom Provider, this algorithm is the SecureRandom default:
putService(DelegatingSecureRandomService(this) { putService(DelegatingSecureRandomService(this))
// Unlike all the NativePRNG algorithms, this doesn't use a global lock:
object : SecureRandom(sun.security.provider.SecureRandom(), null) {}
})
} }
} }
@ -50,14 +51,16 @@ object CordaObjectIdentifier {
val COMPOSITE_SIGNATURE = ASN1ObjectIdentifier("2.25.30086077608615255153862931087626791003") val COMPOSITE_SIGNATURE = ASN1ObjectIdentifier("2.25.30086077608615255153862931087626791003")
} }
internal class DelegatingSecureRandomService internal constructor( // Unlike all the NativePRNG algorithms, this doesn't use a global lock:
provider: CordaSecurityProvider, secureRandomFactory: () -> SecureRandom) : Provider.Service( private class SunSecureRandom : SecureRandom(sun.security.provider.SecureRandom(), null)
private class DelegatingSecureRandomService(provider: CordaSecurityProvider) : Provider.Service(
provider, type, CORDA_SECURE_RANDOM_ALGORITHM, DelegatingSecureRandomSpi::class.java.name, null, null) { provider, type, CORDA_SECURE_RANDOM_ALGORITHM, DelegatingSecureRandomSpi::class.java.name, null, null) {
internal companion object { private companion object {
internal val type = "SecureRandom" private const val type = "SecureRandom"
} }
internal val instance = DelegatingSecureRandomSpi(secureRandomFactory) internal val instance = DelegatingSecureRandomSpi(::SunSecureRandom)
override fun newInstance(constructorParameter: Any?) = instance override fun newInstance(constructorParameter: Any?) = instance
} }