Restructure net.corda.core.crypto package

* Rename KeyFactory to CompositeKeyFactory
* Move expandedCompositeKeys into TestDSL as the only place that uses it
* Move NullKeys out of their own package
* Move remaining crypto classes into superpackage
* Move utility classes out of crypto and into utilities package

client/jackson/src/main/kotlin/net/corda/client/jackson/JacksonSupport.kt

@@ -12,7 +12,7 @@ import net.corda.core.contracts.Amount
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.*
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party
@@ -27,6 +27,8 @@ import net.corda.core.transactions.NotaryChangeWireTransaction
 import net.corda.core.transactions.SignedTransaction
 import net.corda.core.transactions.WireTransaction
 import net.corda.core.utilities.OpaqueBytes
+import net.corda.core.utilities.parsePublicKeyBase58
+import net.corda.core.utilities.toBase58String
 import net.i2p.crypto.eddsa.EdDSAPublicKey
 import org.bouncycastle.asn1.x500.X500Name
 import java.math.BigDecimal

core/src/main/kotlin/net/corda/core/contracts/Amount.kt

@@ -1,6 +1,6 @@
 package net.corda.core.contracts
 
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.exactAdd

core/src/main/kotlin/net/corda/core/crypto/CompositeKey.kt

@@ -1,12 +1,8 @@
-package net.corda.core.crypto.composite
+package net.corda.core.crypto
 
-import net.corda.core.crypto.Crypto
+import net.corda.core.crypto.CompositeKey.NodeAndWeight
-import net.corda.core.crypto.composite.CompositeKey.NodeAndWeight
-import net.corda.core.crypto.keys
-import net.corda.core.crypto.provider.CordaObjectIdentifier
-import net.corda.core.crypto.toStringShort
-import net.corda.core.utilities.exactAdd
 import net.corda.core.serialization.CordaSerializable
+import net.corda.core.utilities.exactAdd
 import net.corda.core.utilities.sequence
 import org.bouncycastle.asn1.*
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier
@@ -269,11 +265,3 @@ class CompositeKey private constructor(val threshold: Int, children: List<NodeAn
         }
     }
 }
-
-/**
- * Expands all [CompositeKey]s present in PublicKey iterable to set of single [PublicKey]s.
- * If an element of the set is a single PublicKey it gives just that key, if it is a [CompositeKey] it returns all leaf
- * keys for that composite element.
- */
-val Iterable<PublicKey>.expandedCompositeKeys: Set<PublicKey>
-    get() = flatMap { it.keys }.toSet()

core/src/main/kotlin/net/corda/core/crypto/CompositeKeyFactory.kt

@@ -1,11 +1,14 @@
-package net.corda.core.crypto.composite
+package net.corda.core.crypto
 
 import java.security.*
 import java.security.spec.InvalidKeySpecException
 import java.security.spec.KeySpec
 import java.security.spec.X509EncodedKeySpec
 
-class KeyFactory : KeyFactorySpi() {
+/**
+ * Factory for generating composite keys from ASN.1 format key specifications. This is used by [CordaSecurityProvider].
+ */
+class CompositeKeyFactory : KeyFactorySpi() {
 
     @Throws(InvalidKeySpecException::class)
     override fun engineGeneratePrivate(keySpec: KeySpec): PrivateKey {

core/src/main/kotlin/net/corda/core/crypto/CompositeSignature.kt

@@ -1,7 +1,5 @@
-package net.corda.core.crypto.composite
+package net.corda.core.crypto
 
-import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.TransactionSignature
 import net.corda.core.serialization.deserialize
 import java.io.ByteArrayOutputStream
 import java.security.*

core/src/main/kotlin/net/corda/core/crypto/CordaSecurityProvider.kt

@@ -1,7 +1,5 @@
-package net.corda.core.crypto.provider
+package net.corda.core.crypto
 
-import net.corda.core.crypto.composite.CompositeKey
-import net.corda.core.crypto.composite.CompositeSignature
 import org.bouncycastle.asn1.ASN1ObjectIdentifier
 import java.security.AccessController
 import java.security.PrivilegedAction
@@ -17,8 +15,8 @@ class CordaSecurityProvider : Provider(PROVIDER_NAME, 0.1, "$PROVIDER_NAME secur
     }
 
     private fun setup() {
-        put("KeyFactory.${CompositeKey.KEY_ALGORITHM}", "net.corda.core.crypto.composite.KeyFactory")
+        put("KeyFactory.${CompositeKey.KEY_ALGORITHM}", "net.corda.core.crypto.CompositeKeyFactory")
-        put("Signature.${CompositeSignature.SIGNATURE_ALGORITHM}", "net.corda.core.crypto.composite.CompositeSignature")
+        put("Signature.${CompositeSignature.SIGNATURE_ALGORITHM}", "net.corda.core.crypto.CompositeSignature")
 
         val compositeKeyOID = CordaObjectIdentifier.COMPOSITE_KEY.id
         put("Alg.Alias.KeyFactory.$compositeKeyOID", CompositeKey.KEY_ALGORITHM)

core/src/main/kotlin/net/corda/core/crypto/Crypto.kt

@@ -1,9 +1,5 @@
 package net.corda.core.crypto
 
-import net.corda.core.crypto.composite.CompositeKey
-import net.corda.core.crypto.composite.CompositeSignature
-import net.corda.core.crypto.provider.CordaObjectIdentifier
-import net.corda.core.crypto.provider.CordaSecurityProvider
 import net.corda.core.serialization.serialize
 import net.i2p.crypto.eddsa.EdDSAEngine
 import net.i2p.crypto.eddsa.EdDSAPrivateKey

core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt

@@ -2,8 +2,9 @@
 
 package net.corda.core.crypto
 
-import net.corda.core.crypto.composite.CompositeKey
 import net.corda.core.utilities.OpaqueBytes
+import net.corda.core.utilities.toBase58
+import net.corda.core.utilities.toSHA256Bytes
 import java.math.BigInteger
 import java.security.*
 

core/src/main/kotlin/net/corda/core/crypto/NullKeys.kt

@@ -0,0 +1,22 @@
+package net.corda.core.crypto
+
+import net.corda.core.identity.AnonymousParty
+import net.corda.core.serialization.CordaSerializable
+import java.security.PublicKey
+
+object NullKeys {
+    @CordaSerializable
+    object NullPublicKey : PublicKey, Comparable<PublicKey> {
+        override fun getAlgorithm() = "NULL"
+        override fun getEncoded() = byteArrayOf(0)
+        override fun getFormat() = "NULL"
+        override fun compareTo(other: PublicKey): Int = if (other == NullPublicKey) 0 else -1
+        override fun toString() = "NULL_KEY"
+    }
+
+    val NULL_PARTY = AnonymousParty(NullPublicKey)
+
+    /** A signature with a key and value of zero. Useful when you want a signature object that you know won't ever be used. */
+    val NULL_SIGNATURE = TransactionSignature(ByteArray(32), NullPublicKey, SignatureMetadata(1, -1))
+
+}

core/src/main/kotlin/net/corda/core/crypto/testing/NullKeys.kt

@@ -1,21 +0,0 @@
-package net.corda.core.crypto.testing
-
-import net.corda.core.crypto.SignatureMetadata
-import net.corda.core.crypto.TransactionSignature
-import net.corda.core.identity.AnonymousParty
-import net.corda.core.serialization.CordaSerializable
-import java.security.PublicKey
-
-@CordaSerializable
-object NullPublicKey : PublicKey, Comparable<PublicKey> {
-    override fun getAlgorithm() = "NULL"
-    override fun getEncoded() = byteArrayOf(0)
-    override fun getFormat() = "NULL"
-    override fun compareTo(other: PublicKey): Int = if (other == NullPublicKey) 0 else -1
-    override fun toString() = "NULL_KEY"
-}
-
-val NULL_PARTY = AnonymousParty(NullPublicKey)
-
-/** A signature with a key and value of zero. Useful when you want a signature object that you know won't ever be used. */
-val NULL_SIGNATURE = TransactionSignature(ByteArray(32), NullPublicKey, SignatureMetadata(1, -1))

core/src/main/kotlin/net/corda/core/flows/CollectSignaturesFlow.kt

@@ -3,7 +3,7 @@ package net.corda.core.flows
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.crypto.TransactionSignature
 import net.corda.core.crypto.isFulfilledBy
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub

core/src/main/kotlin/net/corda/core/identity/Party.kt

@@ -2,7 +2,7 @@ package net.corda.core.identity
 
 import net.corda.core.contracts.PartyAndReference
 import net.corda.core.crypto.Crypto
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.utilities.OpaqueBytes
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.cert.X509CertificateHolder

core/src/main/kotlin/net/corda/core/node/NodeInfo.kt

@@ -1,16 +1,12 @@
 package net.corda.core.node
 
-import net.corda.core.crypto.locationOrNull
 import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
-import net.corda.core.schemas.MappedSchema
-import net.corda.core.schemas.NodeInfoSchemaV1
 import net.corda.core.serialization.CordaSerializable
 import net.corda.core.utilities.NetworkHostAndPort
-import net.corda.core.utilities.NonEmptySet
+import net.corda.core.utilities.locationOrNull
-import net.corda.core.serialization.serialize
 
 /**
  * Information for an advertised service including the service specific identity information.

core/src/main/kotlin/net/corda/core/schemas/CommonSchema.kt

@@ -4,7 +4,6 @@ import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.FungibleAsset
 import net.corda.core.contracts.OwnableState
 import net.corda.core.contracts.UniqueIdentifier
-import net.corda.core.crypto.toBase58String
 import net.corda.core.identity.AbstractParty
 import java.util.*
 import javax.persistence.*

core/src/main/kotlin/net/corda/core/schemas/NodeInfoSchema.kt

@@ -1,28 +1,15 @@
 package net.corda.core.schemas
 
-import net.corda.core.crypto.toBase58String
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.ServiceEntry
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import net.corda.core.utilities.NetworkHostAndPort
+import net.corda.core.utilities.toBase58String
 import java.io.Serializable
 import java.security.cert.CertPath
-import javax.persistence.CascadeType
+import javax.persistence.*
-import javax.persistence.Column
-import javax.persistence.ElementCollection
-import javax.persistence.Embeddable
-import javax.persistence.EmbeddedId
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.Id
-import javax.persistence.JoinColumn
-import javax.persistence.JoinTable
-import javax.persistence.Lob
-import javax.persistence.ManyToMany
-import javax.persistence.OneToMany
-import javax.persistence.Table
 
 object NodeInfoSchema
 

core/src/main/kotlin/net/corda/core/transactions/NotaryChangeTransactions.kt

@@ -3,7 +3,7 @@ package net.corda.core.transactions
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.TransactionSignature
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import java.security.PublicKey

core/src/main/kotlin/net/corda/core/utilities/EncodingUtils.kt

@@ -1,7 +1,9 @@
 @file:JvmName("EncodingUtils")
 
-package net.corda.core.crypto
+package net.corda.core.utilities
 
+import net.corda.core.crypto.Base58
+import net.corda.core.crypto.sha256
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import java.nio.charset.Charset

core/src/main/kotlin/net/corda/core/utilities/LegalNameValidator.kt

@@ -2,7 +2,6 @@
 
 package net.corda.core.utilities
 
-import net.corda.core.crypto.commonName
 import org.bouncycastle.asn1.x500.X500Name
 import java.lang.Character.UnicodeScript.*
 import java.text.Normalizer

core/src/main/kotlin/net/corda/core/utilities/X500NameUtils.kt

@@ -1,5 +1,5 @@
 @file:JvmName("X500NameUtils")
-package net.corda.core.crypto
+package net.corda.core.utilities
 
 import net.corda.core.internal.toX509CertHolder
 import org.bouncycastle.asn1.ASN1Encodable

core/src/test/kotlin/net/corda/core/contracts/TransactionTests.kt

@@ -1,7 +1,7 @@
 package net.corda.core.contracts
 
 import net.corda.core.crypto.*
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.core.transactions.LedgerTransaction
 import net.corda.core.transactions.SignedTransaction

core/src/test/kotlin/net/corda/core/crypto/CompositeKeyTests.kt

@@ -1,12 +1,12 @@
 package net.corda.core.crypto
 
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey.NodeAndWeight
-import net.corda.core.crypto.composite.CompositeKey.NodeAndWeight
-import net.corda.core.crypto.composite.CompositeSignature
 import net.corda.core.internal.declaredField
 import net.corda.core.internal.div
 import net.corda.core.serialization.serialize
 import net.corda.core.utilities.OpaqueBytes
+import net.corda.core.utilities.cert
+import net.corda.core.utilities.toBase58String
 import net.corda.node.utilities.*
 import net.corda.testing.TestDependencyInjectionBase
 import net.corda.testing.kryoSpecific
@@ -88,7 +88,7 @@ class CompositeKeyTests : TestDependencyInjectionBase() {
         val aliceAndBobOrCharlie = CompositeKey.Builder().addKeys(aliceAndBob, charliePublicKey).build(threshold = 1)
 
         val encoded = aliceAndBobOrCharlie.toBase58String()
-        val decoded = parsePublicKeyBase58(encoded)
+        val decoded = net.corda.core.utilities.parsePublicKeyBase58(encoded)
 
         assertEquals(decoded, aliceAndBobOrCharlie)
     }

core/src/test/kotlin/net/corda/core/crypto/X509NameConstraintsTest.kt

@@ -1,6 +1,7 @@
 package net.corda.core.crypto
 
 import net.corda.core.internal.toTypedArray
+import net.corda.core.utilities.cert
 import net.corda.node.utilities.*
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.asn1.x509.GeneralName
@@ -18,13 +19,13 @@ class X509NameConstraintsTest {
 
     private fun makeKeyStores(subjectName: X500Name, nameConstraints: NameConstraints): Pair<KeyStore, KeyStore> {
         val rootKeys = Crypto.generateKeyPair(X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME)
-        val rootCACert = X509Utilities.createSelfSignedCACertificate(getX509Name("Corda Root CA", "London", "demo@r3.com", null), rootKeys)
+        val rootCACert = X509Utilities.createSelfSignedCACertificate(net.corda.core.utilities.getX509Name("Corda Root CA", "London", "demo@r3.com", null), rootKeys)
 
         val intermediateCAKeyPair = Crypto.generateKeyPair(X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME)
-        val intermediateCACert = X509Utilities.createCertificate(CertificateType.INTERMEDIATE_CA, rootCACert, rootKeys, getX509Name("Corda Intermediate CA", "London", "demo@r3.com", null), intermediateCAKeyPair.public)
+        val intermediateCACert = X509Utilities.createCertificate(CertificateType.INTERMEDIATE_CA, rootCACert, rootKeys, net.corda.core.utilities.getX509Name("Corda Intermediate CA", "London", "demo@r3.com", null), intermediateCAKeyPair.public)
 
         val clientCAKeyPair = Crypto.generateKeyPair(X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME)
-        val clientCACert = X509Utilities.createCertificate(CertificateType.INTERMEDIATE_CA, intermediateCACert, intermediateCAKeyPair, getX509Name("Corda Client CA", "London", "demo@r3.com", null), clientCAKeyPair.public, nameConstraints = nameConstraints)
+        val clientCACert = X509Utilities.createCertificate(CertificateType.INTERMEDIATE_CA, intermediateCACert, intermediateCAKeyPair, net.corda.core.utilities.getX509Name("Corda Client CA", "London", "demo@r3.com", null), clientCAKeyPair.public, nameConstraints = nameConstraints)
 
         val keyPass = "password"
         val trustStore = KeyStore.getInstance(KEYSTORE_TYPE)

core/src/test/kotlin/net/corda/core/utilities/EncodingUtilsTest.kt

@@ -1,5 +1,6 @@
-package net.corda.core.crypto
+package net.corda.core.utilities
 
+import net.corda.core.crypto.AddressFormatException
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.fail

experimental/src/main/kotlin/net/corda/finance/contracts/universal/PrettyPrint.kt

@@ -1,6 +1,6 @@
 package net.corda.finance.contracts.universal
 
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.crypto.toStringShort
 import net.corda.core.identity.Party
 import java.math.BigDecimal

finance/src/main/java/net/corda/finance/contracts/JavaCommercialPaper.java

@@ -3,7 +3,7 @@ package net.corda.finance.contracts;
 import co.paralleluniverse.fibers.Suspendable;
 import kotlin.Unit;
 import net.corda.core.contracts.*;
-import net.corda.core.crypto.testing.NullPublicKey;
+import net.corda.core.crypto.NullKeys.NullPublicKey;
 import net.corda.core.identity.AbstractParty;
 import net.corda.core.identity.AnonymousParty;
 import net.corda.core.identity.Party;

finance/src/main/kotlin/net/corda/finance/contracts/CommercialPaper.kt

@@ -2,8 +2,8 @@ package net.corda.finance.contracts
 
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.*
-import net.corda.core.crypto.testing.NULL_PARTY
+import net.corda.core.crypto.NullKeys.NULL_PARTY
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.internal.Emoji

finance/src/main/kotlin/net/corda/finance/contracts/asset/Cash.kt

@@ -6,8 +6,8 @@ import net.corda.finance.contracts.asset.cash.selection.CashSelectionH2Impl
 import net.corda.core.contracts.*
 import net.corda.core.contracts.Amount.Companion.sumOrThrow
 import net.corda.core.crypto.entropyToKeyPair
-import net.corda.core.crypto.testing.NULL_PARTY
+import net.corda.core.crypto.NullKeys.NULL_PARTY
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.internal.Emoji

finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionH2Impl.kt

@@ -7,7 +7,7 @@ import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.TransactionState
 import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub

finance/src/test/kotlin/net/corda/finance/contracts/asset/DummyFungibleContract.kt

@@ -1,7 +1,7 @@
 package net.corda.finance.contracts.asset
 
 import net.corda.core.contracts.*
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.internal.Emoji
 import net.corda.core.schemas.MappedSchema

finance/src/test/kotlin/net/corda/finance/contracts/asset/ObligationTests.kt

@@ -3,7 +3,7 @@ package net.corda.finance.contracts.asset
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.sha256
-import net.corda.core.crypto.testing.NULL_PARTY
+import net.corda.core.crypto.NullKeys.NULL_PARTY
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.AnonymousParty
 import net.corda.core.transactions.TransactionBuilder

node-api/src/main/kotlin/net/corda/nodeapi/ArtemisMessagingComponent.kt

@@ -1,6 +1,6 @@
 package net.corda.nodeapi
 
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.messaging.MessageRecipientGroup
 import net.corda.core.messaging.MessageRecipients
 import net.corda.core.messaging.SingleMessageRecipient

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/DefaultKryoCustomizer.kt

@@ -11,7 +11,7 @@ import de.javakaffee.kryoserializers.BitSetSerializer
 import de.javakaffee.kryoserializers.UnmodifiableCollectionsSerializer
 import de.javakaffee.kryoserializers.guava.*
 import net.corda.core.contracts.PrivacySalt
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.CordaPluginRegistry
 import net.corda.core.serialization.SerializeAsToken

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt

@@ -11,7 +11,7 @@ import net.corda.core.contracts.*
 import net.corda.core.crypto.Crypto
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.TransactionSignature
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.core.internal.VisibleForTesting
 import net.corda.core.serialization.AttachmentsClassLoader

node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/amqp/Schema.kt

@@ -2,7 +2,7 @@ package net.corda.nodeapi.internal.serialization.amqp
 
 import com.google.common.hash.Hasher
 import com.google.common.hash.Hashing
-import net.corda.core.crypto.toBase64
+import net.corda.core.utilities.toBase64
 import net.corda.core.utilities.OpaqueBytes
 import net.corda.core.utilities.loggerFor
 import org.apache.qpid.proton.amqp.DescribedType

node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt

@@ -3,7 +3,7 @@ package net.corda.node.services
 import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.contracts.ContractState
 import net.corda.core.contracts.StateRef
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.flows.NotaryError
 import net.corda.core.flows.NotaryException
 import net.corda.core.flows.NotaryFlow

node/src/integration-test/kotlin/net/corda/services/messaging/MQSecurityTest.kt

@@ -3,7 +3,7 @@ package net.corda.services.messaging
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.client.rpc.CordaRPCClient
 import net.corda.core.crypto.generateKeyPair
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatedBy
 import net.corda.core.flows.InitiatingFlow

node/src/integration-test/kotlin/net/corda/services/messaging/P2PSecurityTest.kt

@@ -2,7 +2,7 @@ package net.corda.services.messaging
 
 import com.nhaarman.mockito_kotlin.whenever
 import net.corda.core.concurrent.CordaFuture
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.crypto.random63BitValue
 import net.corda.core.node.NodeInfo
 import net.corda.core.utilities.seconds

node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt

@@ -24,9 +24,7 @@ import net.corda.core.node.services.NetworkMapCache.MapChange
 import net.corda.core.serialization.SerializeAsToken
 import net.corda.core.serialization.SingletonSerializeAsToken
 import net.corda.core.transactions.SignedTransaction
-import net.corda.core.utilities.NetworkHostAndPort
+import net.corda.core.utilities.*
-import net.corda.core.utilities.debug
-import net.corda.core.utilities.toNonEmptySet
 import net.corda.node.services.ContractUpgradeHandler
 import net.corda.node.services.NotaryChangeHandler
 import net.corda.node.services.NotifyTransactionHandler

node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt

@@ -3,8 +3,8 @@ package net.corda.node.internal
 import com.jcabi.manifests.Manifests
 import com.typesafe.config.ConfigException
 import joptsimple.OptionException
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
-import net.corda.core.crypto.orgName
+import net.corda.core.utilities.orgName
 import net.corda.core.internal.concurrent.thenMatch
 import net.corda.core.internal.createDirectories
 import net.corda.core.internal.div
@@ -12,11 +12,9 @@ import net.corda.core.internal.*
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.utilities.loggerFor
 import net.corda.node.*
-import net.corda.node.serialization.NodeClock
 import net.corda.node.services.config.FullNodeConfiguration
 import net.corda.node.services.transactions.bftSMaRtSerialFilter
 import net.corda.node.shell.InteractiveShell
-import net.corda.node.utilities.TestClock
 import net.corda.node.utilities.registration.HTTPNetworkRegistrationService
 import net.corda.node.utilities.registration.NetworkRegistrationHelper
 import net.corda.nodeapi.internal.addShutdownHook

node/src/main/kotlin/net/corda/node/services/identity/InMemoryIdentityService.kt

@@ -1,7 +1,7 @@
 package net.corda.node.services.identity
 
 import net.corda.core.contracts.PartyAndReference
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.crypto.toStringShort
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.AnonymousParty

node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt

@@ -1,7 +1,7 @@
 package net.corda.node.services.keys
 
 import net.corda.core.crypto.Crypto
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.services.IdentityService
 import net.corda.core.utilities.days

node/src/main/kotlin/net/corda/node/services/keys/PersistentKeyManagementService.kt

@@ -8,6 +8,8 @@ import net.corda.core.serialization.SerializationDefaults
 import net.corda.core.serialization.SingletonSerializeAsToken
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
+import net.corda.core.utilities.parsePublicKeyBase58
+import net.corda.core.utilities.toBase58String
 import net.corda.node.utilities.AppendOnlyPersistentMap
 import net.corda.node.utilities.NODE_DATABASE_PREFIX
 import org.bouncycastle.operator.ContentSigner

node/src/main/kotlin/net/corda/node/services/messaging/ArtemisMessagingServer.kt

@@ -5,7 +5,7 @@ import io.netty.handler.ssl.SslHandler
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.crypto.AddressFormatException
 import net.corda.core.crypto.newSecureRandom
-import net.corda.core.crypto.parsePublicKeyBase58
+import net.corda.core.utilities.parsePublicKeyBase58
 import net.corda.core.crypto.random63BitValue
 import net.corda.core.internal.ThreadBox
 import net.corda.core.internal.concurrent.openFuture

node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapCache.kt

@@ -1,12 +1,10 @@
 package net.corda.node.services.network
 
 import net.corda.core.concurrent.CordaFuture
-import net.corda.core.internal.bufferUntilSubscribed
-import net.corda.core.crypto.parsePublicKeyBase58
-import net.corda.core.crypto.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.internal.VisibleForTesting
+import net.corda.core.internal.bufferUntilSubscribed
 import net.corda.core.internal.concurrent.map
 import net.corda.core.internal.concurrent.openFuture
 import net.corda.core.messaging.DataFeed
@@ -20,6 +18,8 @@ import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.loggerFor
+import net.corda.core.utilities.parsePublicKeyBase58
+import net.corda.core.utilities.toBase58String
 import net.corda.node.services.api.NetworkCacheError
 import net.corda.node.services.api.NetworkMapCacheInternal
 import net.corda.node.services.api.ServiceHubInternal

node/src/main/kotlin/net/corda/node/services/network/PersistentNetworkMapService.kt

@@ -1,6 +1,6 @@
 package net.corda.node.services.network
 
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.internal.ThreadBox
 import net.corda.core.messaging.SingleMessageRecipient

node/src/main/kotlin/net/corda/node/services/transactions/BFTNonValidatingNotaryService.kt

@@ -14,10 +14,7 @@ import net.corda.core.schemas.PersistentStateRef
 import net.corda.core.serialization.deserialize
 import net.corda.core.serialization.serialize
 import net.corda.core.transactions.FilteredTransaction
-import net.corda.core.utilities.debug
+import net.corda.core.utilities.*
-import net.corda.core.utilities.getOrThrow
-import net.corda.core.utilities.loggerFor
-import net.corda.core.utilities.unwrap
 import net.corda.node.services.api.ServiceHubInternal
 import net.corda.node.utilities.AppendOnlyPersistentMap
 import net.corda.node.utilities.NODE_DATABASE_PREFIX

node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt

@@ -2,8 +2,8 @@ package net.corda.node.services.transactions
 
 import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.parsePublicKeyBase58
+import net.corda.core.utilities.parsePublicKeyBase58
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.Party
 import net.corda.core.internal.ThreadBox
 import net.corda.core.node.services.UniquenessException

node/src/main/kotlin/net/corda/node/shell/FlowWatchPrintingSubscriber.kt

@@ -1,6 +1,6 @@
 package net.corda.node.shell
 
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.flows.FlowInitiator
 import net.corda.core.flows.StateMachineRunId
 import net.corda.core.internal.concurrent.openFuture

node/src/main/kotlin/net/corda/node/utilities/KeyStoreUtilities.kt

@@ -1,8 +1,8 @@
 package net.corda.node.utilities
 
-import net.corda.core.crypto.CertificateAndKeyPair
+import net.corda.core.utilities.CertificateAndKeyPair
 import net.corda.core.crypto.Crypto
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.internal.exists
 import net.corda.core.internal.read
 import net.corda.core.internal.toX509CertHolder

node/src/main/kotlin/net/corda/node/utilities/ServiceIdentityGenerator.kt

@@ -1,6 +1,6 @@
 package net.corda.node.utilities
 
-import net.corda.core.crypto.composite.CompositeKey
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.identity.Party
 import net.corda.core.utilities.loggerFor

node/src/main/kotlin/net/corda/node/utilities/X509Utilities.kt

@@ -1,6 +1,7 @@
 package net.corda.node.utilities
 
 import net.corda.core.crypto.*
+import net.corda.core.utilities.cert
 import net.corda.core.utilities.days
 import net.corda.core.utilities.millis
 import org.bouncycastle.asn1.ASN1EncodableVector

node/src/main/kotlin/net/corda/node/utilities/registration/NetworkRegistrationHelper.kt

@@ -1,7 +1,7 @@
 package net.corda.node.utilities.registration
 
 import net.corda.core.crypto.Crypto
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.internal.*
 import net.corda.core.utilities.seconds
 import net.corda.core.utilities.validateX500Name

node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java

@@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableSet;
 import kotlin.Pair;
 import kotlin.Triple;
 import net.corda.core.contracts.*;
-import net.corda.core.crypto.EncodingUtils;
 import net.corda.core.identity.AbstractParty;
 import net.corda.core.messaging.DataFeed;
 import net.corda.core.node.services.IdentityService;
@@ -16,6 +15,7 @@ import net.corda.core.node.services.vault.QueryCriteria.LinearStateQueryCriteria
 import net.corda.core.node.services.vault.QueryCriteria.VaultCustomQueryCriteria;
 import net.corda.core.node.services.vault.QueryCriteria.VaultQueryCriteria;
 import net.corda.core.schemas.MappedSchema;
+import net.corda.core.utilities.EncodingUtils;
 import net.corda.core.utilities.OpaqueBytes;
 import net.corda.finance.contracts.DealState;
 import net.corda.finance.contracts.asset.Cash;

node/src/test/kotlin/net/corda/node/services/config/FullNodeConfigurationTest.kt

@@ -1,6 +1,6 @@
 package net.corda.node.services.config
 
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.testing.ALICE
 import net.corda.nodeapi.User

node/src/test/kotlin/net/corda/node/services/network/InMemoryIdentityServiceTests.kt

@@ -1,8 +1,8 @@
 package net.corda.node.services.network
 
-import net.corda.core.crypto.CertificateAndKeyPair
+import net.corda.core.utilities.CertificateAndKeyPair
 import net.corda.core.crypto.Crypto
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.identity.AnonymousParty
 import net.corda.core.identity.Party

node/src/test/kotlin/net/corda/node/services/network/PersistentNetworkMapCacheTest.kt

@@ -1,7 +1,6 @@
 package net.corda.node.services.network
 
 import co.paralleluniverse.fibers.Suspendable
-import net.corda.core.crypto.toBase58String
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatedBy
 import net.corda.core.flows.InitiatingFlow
@@ -10,6 +9,7 @@ import net.corda.core.node.NodeInfo
 import net.corda.core.utilities.NetworkHostAndPort
 import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.seconds
+import net.corda.core.utilities.toBase58String
 import net.corda.core.utilities.unwrap
 import net.corda.node.internal.Node
 import net.corda.testing.ALICE

node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt

@@ -5,7 +5,7 @@ import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.StateRef
 import net.corda.core.contracts.TransactionState
 import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.node.services.Vault
 import net.corda.core.node.services.VaultService
 import net.corda.core.schemas.CommonSchemaV1

node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt

@@ -3,7 +3,7 @@ package net.corda.node.services.vault
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.entropyToKeyPair
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.Party
 import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.services.*

node/src/test/kotlin/net/corda/node/utilities/X509UtilitiesTest.kt

@@ -3,9 +3,9 @@ package net.corda.node.utilities
 import net.corda.core.crypto.Crypto
 import net.corda.core.crypto.Crypto.EDDSA_ED25519_SHA512
 import net.corda.core.crypto.Crypto.generateKeyPair
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
-import net.corda.core.crypto.getX509Name
+import net.corda.core.utilities.getX509Name
 import net.corda.core.internal.div
 import net.corda.core.internal.toTypedArray
 import net.corda.core.serialization.SerializationContext

node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt

@@ -5,8 +5,8 @@ import com.nhaarman.mockito_kotlin.eq
 import com.nhaarman.mockito_kotlin.mock
 import net.corda.core.crypto.Crypto
 import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.internal.exists
 import net.corda.core.internal.toTypedArray
 import net.corda.core.internal.toX509CertHolder

samples/irs-demo/src/main/kotlin/net/corda/irs/flows/FixingFlow.kt

@@ -3,7 +3,7 @@ package net.corda.irs.flows
 import co.paralleluniverse.fibers.Suspendable
 import net.corda.core.contracts.*
 import net.corda.core.crypto.TransactionSignature
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.InitiatedBy
 import net.corda.core.flows.InitiatingFlow

samples/network-visualiser/src/main/kotlin/net/corda/netmap/NetworkMapVisualiser.kt

@@ -11,7 +11,7 @@ import javafx.scene.input.KeyCodeCombination
 import javafx.scene.layout.VBox
 import javafx.stage.Stage
 import javafx.util.Duration
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.serialization.deserialize
 import net.corda.core.utilities.ProgressTracker
 import net.corda.netmap.VisualiserViewModel.Style

samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt

@@ -7,7 +7,7 @@ import javafx.scene.layout.StackPane
 import javafx.scene.shape.Circle
 import javafx.scene.shape.Line
 import javafx.util.Duration
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.node.ScreenCoordinate
 import net.corda.core.utilities.ProgressTracker
 import net.corda.netmap.simulation.IRSSimulation

samples/network-visualiser/src/main/kotlin/net/corda/netmap/simulation/Simulation.kt

@@ -1,7 +1,7 @@
 package net.corda.netmap.simulation
 
 import net.corda.core.concurrent.CordaFuture
-import net.corda.core.crypto.locationOrNull
+import net.corda.core.utilities.locationOrNull
 import net.corda.core.flows.FlowLogic
 import net.corda.core.messaging.SingleMessageRecipient
 import net.corda.core.node.CityDatabase

samples/notary-demo/src/main/kotlin/net/corda/notarydemo/RaftNotaryCordform.kt

@@ -1,6 +1,6 @@
 package net.corda.notarydemo
 
-import net.corda.core.crypto.appendToCommonName
+import net.corda.core.utilities.appendToCommonName
 import net.corda.core.internal.div
 import net.corda.core.node.services.ServiceInfo
 import net.corda.testing.ALICE

samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/api/PortfolioApi.kt

@@ -2,8 +2,8 @@ package net.corda.vega.api
 
 import com.opengamma.strata.basics.currency.MultiCurrencyAmount
 import net.corda.core.contracts.StateAndRef
-import net.corda.core.crypto.parsePublicKeyBase58
+import net.corda.core.utilities.parsePublicKeyBase58
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
 import net.corda.core.messaging.CordaRPCOps

samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/api/PortfolioApiUtils.kt

@@ -5,10 +5,10 @@ import com.opengamma.strata.product.swap.IborRateCalculation
 import com.opengamma.strata.product.swap.RateCalculationSwapLeg
 import com.opengamma.strata.product.swap.SwapLegType
 import net.corda.core.contracts.hash
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.vega.contracts.IRSState
 import net.corda.vega.contracts.PortfolioState

samples/simm-valuation-demo/src/main/kotlin/net/corda/vega/contracts/SwapData.kt

@@ -10,7 +10,7 @@ import com.opengamma.strata.product.swap.SwapTrade
 import com.opengamma.strata.product.swap.type.FixedIborSwapConvention
 import com.opengamma.strata.product.swap.type.FixedIborSwapConventions
 import net.corda.core.identity.AbstractParty
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.serialization.CordaSerializable
 import java.math.BigDecimal
 import java.security.PublicKey

smoke-test-utils/src/main/kotlin/net/corda/smoketesting/NodeConfig.kt

@@ -5,7 +5,7 @@ import com.typesafe.config.ConfigFactory.empty
 import com.typesafe.config.ConfigRenderOptions
 import com.typesafe.config.ConfigValue
 import com.typesafe.config.ConfigValueFactory
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.nodeapi.User
 import org.bouncycastle.asn1.x500.X500Name
 

test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt

@@ -12,9 +12,7 @@ import net.corda.core.identity.PartyAndCertificate
 import net.corda.core.node.ServiceHub
 import net.corda.core.node.services.IdentityService
 import net.corda.core.transactions.TransactionBuilder
-import net.corda.core.utilities.NetworkHostAndPort
+import net.corda.core.utilities.*
-import net.corda.core.utilities.OpaqueBytes
-import net.corda.core.utilities.loggerFor
 import net.corda.finance.contracts.asset.DUMMY_CASH_ISSUER
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.config.VerifierType

test-utils/src/main/kotlin/net/corda/testing/TestConstants.kt

@@ -4,7 +4,7 @@ package net.corda.testing
 
 import net.corda.core.contracts.Command
 import net.corda.core.contracts.TypeOnlyCommandData
-import net.corda.core.crypto.CertificateAndKeyPair
+import net.corda.core.utilities.CertificateAndKeyPair
 import net.corda.core.crypto.entropyToKeyPair
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.identity.Party

test-utils/src/main/kotlin/net/corda/testing/TestDSL.kt

@@ -2,8 +2,8 @@ package net.corda.testing
 
 import net.corda.core.contracts.*
 import net.corda.core.crypto.*
-import net.corda.core.crypto.composite.expandedCompositeKeys
+import net.corda.core.crypto.NullKeys.NULL_SIGNATURE
-import net.corda.core.crypto.testing.NULL_SIGNATURE
+import net.corda.core.crypto.CompositeKey
 import net.corda.core.identity.Party
 import net.corda.core.node.ServiceHub
 import net.corda.core.transactions.SignedTransaction
@@ -342,6 +342,14 @@ data class TestLedgerDSLInterpreter private constructor(
     val transactionsUnverified: List<WireTransaction> get() = nonVerifiedTransactionWithLocations.values.map { it.transaction }
 }
 
+/**
+ * Expands all [CompositeKey]s present in PublicKey iterable to set of single [PublicKey]s.
+ * If an element of the set is a single PublicKey it gives just that key, if it is a [CompositeKey] it returns all leaf
+ * keys for that composite element.
+ */
+val Iterable<PublicKey>.expandedCompositeKeys: Set<PublicKey>
+    get() = flatMap { it.keys }.toSet()
+
 /**
  * Signs all transactions passed in.
  * @param transactionsToSign Transactions to be signed.

test-utils/src/main/kotlin/net/corda/testing/driver/Driver.kt

@@ -11,9 +11,9 @@ import net.corda.cordform.CordformNode
 import net.corda.cordform.NodeDefinition
 import net.corda.core.concurrent.CordaFuture
 import net.corda.core.concurrent.firstOf
-import net.corda.core.crypto.appendToCommonName
+import net.corda.core.utilities.appendToCommonName
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
-import net.corda.core.crypto.getX509Name
+import net.corda.core.utilities.getX509Name
 import net.corda.core.identity.Party
 import net.corda.core.internal.ThreadBox
 import net.corda.core.internal.concurrent.*

test-utils/src/main/kotlin/net/corda/testing/node/InMemoryMessagingNetwork.kt

@@ -3,7 +3,7 @@ package net.corda.testing.node
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
-import net.corda.core.crypto.getX509Name
+import net.corda.core.utilities.getX509Name
 import net.corda.core.internal.ThreadBox
 import net.corda.core.messaging.AllPossibleRecipients
 import net.corda.core.messaging.MessageRecipientGroup

test-utils/src/main/kotlin/net/corda/testing/node/MockNode.kt

@@ -3,8 +3,8 @@ package net.corda.testing.node
 import com.google.common.jimfs.Configuration.unix
 import com.google.common.jimfs.Jimfs
 import com.nhaarman.mockito_kotlin.whenever
-import net.corda.core.crypto.CertificateAndKeyPair
+import net.corda.core.utilities.CertificateAndKeyPair
-import net.corda.core.crypto.cert
+import net.corda.core.utilities.cert
 import net.corda.core.crypto.entropyToKeyPair
 import net.corda.core.crypto.random63BitValue
 import net.corda.core.identity.PartyAndCertificate

test-utils/src/main/kotlin/net/corda/testing/node/NodeBasedTest.kt

@@ -1,27 +1,18 @@
 package net.corda.testing.node
 
 import net.corda.core.concurrent.CordaFuture
-import net.corda.core.crypto.appendToCommonName
+import net.corda.core.internal.concurrent.*
-import net.corda.core.crypto.commonName
-import net.corda.core.crypto.getX509Name
-import net.corda.core.internal.concurrent.doneFuture
-import net.corda.core.internal.concurrent.flatMap
-import net.corda.core.internal.concurrent.fork
-import net.corda.core.internal.concurrent.map
-import net.corda.core.internal.concurrent.transpose
 import net.corda.core.internal.createDirectories
 import net.corda.core.internal.div
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
-import net.corda.core.utilities.WHITESPACE
+import net.corda.core.utilities.*
-import net.corda.core.utilities.getOrThrow
 import net.corda.node.internal.Node
 import net.corda.node.services.config.ConfigHelper
 import net.corda.node.services.config.FullNodeConfiguration
 import net.corda.node.services.config.configOf
 import net.corda.node.services.config.plus
 import net.corda.node.services.network.NetworkMapService
-import net.corda.node.services.network.PersistentNetworkMapCache
 import net.corda.node.services.transactions.RaftValidatingNotaryService
 import net.corda.node.utilities.ServiceIdentityGenerator
 import net.corda.nodeapi.User

test-utils/src/main/kotlin/net/corda/testing/node/SimpleNode.kt

@@ -1,7 +1,7 @@
 package net.corda.testing.node
 
 import com.codahale.metrics.MetricRegistry
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.internal.concurrent.openFuture
 import net.corda.core.messaging.RPCOps

tools/demobench/src/main/kotlin/net/corda/demobench/model/NetworkMapConfig.kt

@@ -1,6 +1,6 @@
 package net.corda.demobench.model
 
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.utilities.WHITESPACE
 import org.bouncycastle.asn1.x500.X500Name
 

tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeConfig.kt

@@ -1,7 +1,7 @@
 package net.corda.demobench.model
 
 import com.typesafe.config.*
-import net.corda.core.crypto.locationOrNull
+import net.corda.core.utilities.locationOrNull
 import net.corda.nodeapi.User
 import org.bouncycastle.asn1.x500.X500Name
 import java.io.File

tools/demobench/src/main/kotlin/net/corda/demobench/model/NodeController.kt

@@ -1,8 +1,8 @@
 package net.corda.demobench.model
 
-import net.corda.core.crypto.getX509Name
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
+import net.corda.core.utilities.getX509Name
 import net.corda.demobench.plugin.PluginController
 import net.corda.demobench.pty.R3Pty
 import tornadofx.*

tools/demobench/src/main/kotlin/net/corda/demobench/pty/R3Pty.kt

@@ -4,7 +4,7 @@ import com.jediterm.terminal.ui.JediTermWidget
 import com.jediterm.terminal.ui.UIUtil
 import com.jediterm.terminal.ui.settings.SettingsProvider
 import com.pty4j.PtyProcess
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.utilities.loggerFor
 import org.bouncycastle.asn1.x500.X500Name
 import java.awt.Dimension

tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTabView.kt

@@ -14,7 +14,7 @@ import javafx.scene.layout.Pane
 import javafx.scene.layout.Priority
 import javafx.stage.FileChooser
 import javafx.util.StringConverter
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.internal.div
 import net.corda.core.internal.exists
 import net.corda.core.node.CityDatabase

tools/demobench/src/main/kotlin/net/corda/demobench/views/NodeTerminalView.kt

@@ -15,7 +15,7 @@ import javafx.scene.layout.VBox
 import javafx.util.Duration
 import net.corda.core.concurrent.match
 import net.corda.core.contracts.ContractState
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.vaultTrackBy
 import net.corda.core.node.services.vault.PageSpecification

tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeControllerTest.kt

@@ -1,6 +1,6 @@
 package net.corda.demobench.model
 
-import net.corda.core.crypto.getX509Name
+import net.corda.core.utilities.getX509Name
 import net.corda.nodeapi.User
 import net.corda.testing.DUMMY_NOTARY
 import org.junit.Test
@@ -175,10 +175,10 @@ class NodeControllerTest {
     ) = NodeConfig(
             baseDir,
             legalName = getX509Name(
-                myLegalName = commonName,
+                    myLegalName = commonName,
-                nearestCity = "New York",
+                    nearestCity = "New York",
-                country = "US",
+                    country = "US",
-                email = "corda@city.us.example"
+                    email = "corda@city.us.example"
             ),
             p2pPort = p2pPort,
             rpcPort = rpcPort,

tools/explorer/src/main/kotlin/net/corda/explorer/formatters/PartyNameFormatter.kt

@@ -1,6 +1,6 @@
 package net.corda.explorer.formatters
 
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import org.bouncycastle.asn1.x500.X500Name
 
 object PartyNameFormatter {

tools/explorer/src/main/kotlin/net/corda/explorer/views/Network.kt

@@ -27,13 +27,10 @@ import javafx.util.Duration
 import net.corda.client.jfx.model.*
 import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.ContractState
-import net.corda.core.crypto.locationOrNull
-import net.corda.core.crypto.toBase58String
 import net.corda.core.identity.Party
-import net.corda.core.node.CityDatabase
 import net.corda.core.node.NodeInfo
 import net.corda.core.node.ScreenCoordinate
-import net.corda.core.node.WorldMapLocation
+import net.corda.core.utilities.toBase58String
 import net.corda.explorer.formatters.PartyNameFormatter
 import net.corda.explorer.model.CordaView
 import tornadofx.*

tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt

@@ -22,8 +22,8 @@ import net.corda.client.jfx.utils.map
 import net.corda.client.jfx.utils.sequence
 import net.corda.core.contracts.*
 import net.corda.core.crypto.SecureHash
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.core.crypto.toStringShort
 import net.corda.core.identity.AbstractParty
 import net.corda.core.identity.Party

tools/explorer/src/main/kotlin/net/corda/explorer/views/cordapps/cash/CashViewer.kt

@@ -22,7 +22,7 @@ import net.corda.client.jfx.utils.*
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.contracts.withoutIssuer
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.identity.AbstractParty
 import net.corda.explorer.formatters.AmountFormatter
 import net.corda.explorer.formatters.PartyNameFormatter

tools/loadtest/src/main/kotlin/net/corda/loadtest/LoadTest.kt

@@ -2,7 +2,7 @@ package net.corda.loadtest
 
 import com.google.common.util.concurrent.RateLimiter
 import net.corda.client.mock.Generator
-import net.corda.core.crypto.toBase58String
+import net.corda.core.utilities.toBase58String
 import net.corda.node.services.network.NetworkMapService
 import net.corda.testing.driver.PortAllocation
 import org.slf4j.LoggerFactory

verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt

@@ -3,7 +3,7 @@ package net.corda.verifier
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import net.corda.core.concurrent.CordaFuture
-import net.corda.core.crypto.commonName
+import net.corda.core.utilities.commonName
 import net.corda.core.crypto.random63BitValue
 import net.corda.core.internal.concurrent.*
 import net.corda.core.internal.div