ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2871: Restore CompositeKey support to core-deterministic. (#5333)

Browse Source 
* CORDA-2871: Restore CompositeKey support to core-deterministic.

* Delete empty CordaSecurityProviderKt class from api-current.
This commit is contained in:
Chris Rankin 2019-07-30 17:53:33 +01:00 committed by Matthew Nesbit
parent 36c756eeb6
commit d1289ec379
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/api-current.txt
View File

@ -1537,8 +1537,6 @@ public final class net.corda.core.crypto.CordaSecurityProvider extends java.secu
public static final class net.corda.core.crypto.CordaSecurityProvider$Companion extends java.lang.Object public static final class net.corda.core.crypto.CordaSecurityProvider$Companion extends java.lang.Object
public <init>(kotlin.jvm.internal.DefaultConstructorMarker) public <init>(kotlin.jvm.internal.DefaultConstructorMarker)
## ##
public final class net.corda.core.crypto.CordaSecurityProviderKt extends java.lang.Object
##
public final class net.corda.core.crypto.Crypto extends java.lang.Object public final class net.corda.core.crypto.Crypto extends java.lang.Object
@NotNull @NotNull
public static final java.security.PrivateKey decodePrivateKey(String, byte[]) public static final java.security.PrivateKey decodePrivateKey(String, byte[])

3
core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt
View File

@ -1,6 +1,5 @@
package net.corda.core.crypto package net.corda.core.crypto
import net.corda.core.DeleteForDJVM
import net.corda.core.KeepForDJVM import net.corda.core.KeepForDJVM
import net.corda.core.serialization.CordaSerializable import net.corda.core.serialization.CordaSerializable
import net.corda.core.utilities.exactAdd import net.corda.core.utilities.exactAdd
@ -244,7 +243,7 @@ class CompositeKey private constructor(val threshold: Int, children: List<NodeAn
override fun toString() = "(${children.joinToString()})" override fun toString() = "(${children.joinToString()})"
/** A helper class for building a [CompositeKey]. */ /** A helper class for building a [CompositeKey]. */
@DeleteForDJVM @KeepForDJVM
class Builder { class Builder {
private val children: MutableList<NodeAndWeight> = mutableListOf() private val children: MutableList<NodeAndWeight> = mutableListOf()

4
core/src/main/kotlin/net/corda/core/crypto/CompositeKeyFactory.kt
View File

@ -1,6 +1,6 @@
package net.corda.core.crypto package net.corda.core.crypto
import net.corda.core.DeleteForDJVM import net.corda.core.KeepForDJVM
import java.security.* import java.security.*
import java.security.spec.InvalidKeySpecException import java.security.spec.InvalidKeySpecException
import java.security.spec.KeySpec import java.security.spec.KeySpec
@ -9,7 +9,7 @@ import java.security.spec.X509EncodedKeySpec
/** /**
* Factory for generating composite keys from ASN.1 format key specifications. This is used by [CordaSecurityProvider]. * Factory for generating composite keys from ASN.1 format key specifications. This is used by [CordaSecurityProvider].
*/ */
@DeleteForDJVM @KeepForDJVM
class CompositeKeyFactory : KeyFactorySpi() { class CompositeKeyFactory : KeyFactorySpi() {
@Throws(InvalidKeySpecException::class) @Throws(InvalidKeySpecException::class)

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

@ -15,7 +15,9 @@ class CordaSecurityProvider : Provider(PROVIDER_NAME, 0.1, "$PROVIDER_NAME secur
} }
init { init {
provideNonDeterministic(this) put("KeyFactory.${CompositeKey.KEY_ALGORITHM}", CompositeKeyFactory::class.java.name)
put("Alg.Alias.KeyFactory.$COMPOSITE_KEY", CompositeKey.KEY_ALGORITHM)
put("Alg.Alias.KeyFactory.OID.$COMPOSITE_KEY", CompositeKey.KEY_ALGORITHM)
put("Signature.${CompositeSignature.SIGNATURE_ALGORITHM}", CompositeSignature::class.java.name) put("Signature.${CompositeSignature.SIGNATURE_ALGORITHM}", CompositeSignature::class.java.name)
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)
@ -28,16 +30,6 @@ class CordaSecurityProvider : Provider(PROVIDER_NAME, 0.1, "$PROVIDER_NAME secur
} }
} }
/**
* The core-deterministic module is not allowed to generate keys.
*/
@StubOutForDJVM
private fun provideNonDeterministic(provider: Provider) {
provider["KeyFactory.${CompositeKey.KEY_ALGORITHM}"] = CompositeKeyFactory::class.java.name
provider["Alg.Alias.KeyFactory.$COMPOSITE_KEY"] = CompositeKey.KEY_ALGORITHM
provider["Alg.Alias.KeyFactory.OID.$COMPOSITE_KEY"] = CompositeKey.KEY_ALGORITHM
}
@KeepForDJVM @KeepForDJVM
object CordaObjectIdentifier { object CordaObjectIdentifier {
// UUID-based OID // UUID-based OID