Moved netpermission packages to com.r3.corda

This commit is contained in:
Shams Asari 2016-12-08 13:49:39 +00:00
parent d54dbc414d
commit dfa234fe94
7 changed files with 17 additions and 17 deletions

View File

@ -1,8 +1,8 @@
package com.r3corda.netpermission
package com.r3.corda.netpermission
import com.google.common.net.HostAndPort
import com.r3corda.netpermission.internal.CertificateSigningService
import com.r3corda.netpermission.internal.persistence.DBCertificateRequestStorage
import com.r3.corda.netpermission.internal.CertificateSigningService
import com.r3.corda.netpermission.internal.persistence.DBCertificateRequestStorage
import joptsimple.ArgumentAcceptingOptionSpec
import joptsimple.OptionParser
import net.corda.core.crypto.X509Utilities

View File

@ -1,7 +1,7 @@
package com.r3corda.netpermission.internal
package com.r3.corda.netpermission.internal
import com.r3corda.netpermission.internal.persistence.CertificationData
import com.r3corda.netpermission.internal.persistence.CertificationRequestStorage
import com.r3.corda.netpermission.internal.persistence.CertificationData
import com.r3.corda.netpermission.internal.persistence.CertificationRequestStorage
import net.corda.core.crypto.X509Utilities.CACertAndKey
import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_CA
import net.corda.core.crypto.X509Utilities.CORDA_INTERMEDIATE_CA

View File

@ -1,4 +1,4 @@
package com.r3corda.netpermission.internal.persistence
package com.r3.corda.netpermission.internal.persistence
import org.bouncycastle.pkcs.PKCS10CertificationRequest
import java.security.cert.Certificate

View File

@ -1,4 +1,4 @@
package com.r3corda.netpermission.internal.persistence
package com.r3.corda.netpermission.internal.persistence
import net.corda.core.crypto.SecureHash
import net.corda.node.utilities.*
@ -50,12 +50,12 @@ class DBCertificateRequestStorage(private val database: Database) : Certificatio
override fun saveRequest(certificationData: CertificationData): String {
return databaseTransaction(database) {
withFinalizables { finalizables ->
val requestId = SecureHash.randomSHA256().toString()
val requestId = SecureHash.Companion.randomSHA256().toString()
DataTable.insert {
it[DataTable.requestId] = requestId
it[hostName] = certificationData.hostName
it[ipAddress] = certificationData.ipAddr
it[DataTable.request] = serializeToBlob(certificationData.request, finalizables)
it[request] = serializeToBlob(certificationData.request, finalizables)
it[requestTimestamp] = LocalDateTime.now()
}
requestId

View File

@ -1,4 +1,4 @@
package com.r3corda.netpermission.internal.persistence
package com.r3.corda.netpermission.internal.persistence
import net.corda.core.crypto.SecureHash
import java.security.cert.Certificate

View File

@ -1,11 +1,11 @@
package com.r3corda.netpermission
package com.r3.corda.netpermission
import com.google.common.net.HostAndPort
import com.nhaarman.mockito_kotlin.*
import com.r3corda.netpermission.CertificateSigningServer.Companion.hostAndPort
import com.r3corda.netpermission.internal.CertificateSigningService
import com.r3corda.netpermission.internal.persistence.CertificationData
import com.r3corda.netpermission.internal.persistence.CertificationRequestStorage
import com.r3.corda.netpermission.CertificateSigningServer.Companion.hostAndPort
import com.r3.corda.netpermission.internal.CertificateSigningService
import com.r3.corda.netpermission.internal.persistence.CertificationData
import com.r3.corda.netpermission.internal.persistence.CertificationRequestStorage
import net.corda.core.crypto.SecureHash
import net.corda.core.crypto.X509Utilities
import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest

View File

@ -1,4 +1,4 @@
package com.r3corda.netpermission.internal.persistence
package com.r3.corda.netpermission.internal.persistence
import net.corda.core.crypto.X509Utilities
import net.corda.node.utilities.configureDatabase