From e1943e2b519a7a7ed7d94eb6dbaffba59e2cc06e Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Thu, 31 Aug 2017 16:55:40 +0100 Subject: [PATCH] Move ContentSignerBuilder into net.corda.node.utilities Move `ContentSignerBuilder` into `net.corda.node.utilities` so it's not part of the API visible to CorDapp developers, when it's only needed inside the node itself. --- node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt | 2 +- .../kotlin/net/corda/node/utilities}/ContentSignerBuilder.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) rename {core/src/main/kotlin/net/corda/core/crypto => node/src/main/kotlin/net/corda/node/utilities}/ContentSignerBuilder.kt (95%) diff --git a/node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt b/node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt index 36a2c4f34d..367f79eb3e 100644 --- a/node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt +++ b/node/src/main/kotlin/net/corda/node/services/keys/KMSUtils.kt @@ -1,12 +1,12 @@ package net.corda.node.services.keys -import net.corda.core.crypto.ContentSignerBuilder import net.corda.core.crypto.Crypto import net.corda.core.crypto.cert import net.corda.core.identity.PartyAndCertificate import net.corda.core.node.services.IdentityService import net.corda.core.utilities.days import net.corda.node.utilities.CertificateType +import net.corda.node.utilities.ContentSignerBuilder import net.corda.node.utilities.X509Utilities import org.bouncycastle.operator.ContentSigner import java.security.KeyPair diff --git a/core/src/main/kotlin/net/corda/core/crypto/ContentSignerBuilder.kt b/node/src/main/kotlin/net/corda/node/utilities/ContentSignerBuilder.kt similarity index 95% rename from core/src/main/kotlin/net/corda/core/crypto/ContentSignerBuilder.kt rename to node/src/main/kotlin/net/corda/node/utilities/ContentSignerBuilder.kt index 8a62f308c4..f2a365bf89 100644 --- a/core/src/main/kotlin/net/corda/core/crypto/ContentSignerBuilder.kt +++ b/node/src/main/kotlin/net/corda/node/utilities/ContentSignerBuilder.kt @@ -1,5 +1,6 @@ -package net.corda.core.crypto +package net.corda.node.utilities +import net.corda.core.crypto.SignatureScheme import org.bouncycastle.asn1.x509.AlgorithmIdentifier import org.bouncycastle.operator.ContentSigner import java.io.OutputStream