bitmessage/Jabit
bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Very minor code improvements

Browse Source
This commit is contained in:
Christian Basler 2017-08-11 12:32:20 +02:00
parent 6e79b0c50f
commit c81c89197b
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractCryptography.kt
View File

@ -198,10 +198,10 @@ abstract class AbstractCryptography protected constructor(@JvmField protected va
} }
companion object { companion object {
protected val LOG = LoggerFactory.getLogger(Cryptography::class.java) protected val LOG = LoggerFactory.getLogger(Cryptography::class.java)!!
private val RANDOM = SecureRandom() private val RANDOM = SecureRandom()
private val TWO = BigInteger.valueOf(2) private val TWO = BigInteger.valueOf(2)
private val TWO_POW_64 = TWO.pow(64) private val TWO_POW_64 = TWO.pow(64)!!
private val TWO_POW_16 = TWO.pow(16) private val TWO_POW_16 = TWO.pow(16)!!
} }
} }

24
cryptography-bc/src/test/kotlin/ch/dissem/bitmessage/security/CryptographyTest.kt
View File

@ -23,10 +23,7 @@ import ch.dissem.bitmessage.entity.valueobject.PrivateKey
import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException
import ch.dissem.bitmessage.ports.MultiThreadedPOWEngine import ch.dissem.bitmessage.ports.MultiThreadedPOWEngine
import ch.dissem.bitmessage.ports.ProofOfWorkEngine import ch.dissem.bitmessage.ports.ProofOfWorkEngine
import ch.dissem.bitmessage.utils.CallbackWaiter import ch.dissem.bitmessage.utils.*
import ch.dissem.bitmessage.utils.Singleton
import ch.dissem.bitmessage.utils.TestUtils
import ch.dissem.bitmessage.utils.UnixTime
import ch.dissem.bitmessage.utils.UnixTime.DAY import ch.dissem.bitmessage.utils.UnixTime.DAY
import ch.dissem.bitmessage.utils.UnixTime.MINUTE import ch.dissem.bitmessage.utils.UnixTime.MINUTE
import ch.dissem.bitmessage.utils.UnixTime.now import ch.dissem.bitmessage.utils.UnixTime.now
@ -34,7 +31,6 @@ import org.hamcrest.CoreMatchers.`is`
import org.junit.Assert.* import org.junit.Assert.*
import org.junit.Test import org.junit.Test
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.io.IOException
import javax.xml.bind.DatatypeConverter import javax.xml.bind.DatatypeConverter
/** /**
@ -63,12 +59,12 @@ class CryptographyTest {
} }
@Test @Test
fun ensureDoubleHashYieldsSameResultAsHashOfHash() { fun `ensure double hash yields same result as hash of hash`() {
assertArrayEquals(crypto.sha512(TEST_SHA512), crypto.doubleSha512(TEST_VALUE)) assertArrayEquals(crypto.sha512(TEST_SHA512), crypto.doubleSha512(TEST_VALUE))
} }
@Test(expected = IOException::class) @Test(expected = InsufficientProofOfWorkException::class)
fun ensureExceptionForInsufficientProofOfWork() { fun `ensure exception for insufficient proof of work`() {
val objectMessage = ObjectMessage.Builder() val objectMessage = ObjectMessage.Builder()
.nonce(ByteArray(8)) .nonce(ByteArray(8))
.expiresTime(UnixTime.now + 28 * DAY) .expiresTime(UnixTime.now + 28 * DAY)
@ -79,7 +75,7 @@ class CryptographyTest {
} }
@Test @Test
fun testDoProofOfWork() { fun `ensure proof of work is calculated correctly`() {
TestUtils.mockedInternalContext( TestUtils.mockedInternalContext(
cryptography = crypto, cryptography = crypto,
proofOfWorkEngine = MultiThreadedPOWEngine() proofOfWorkEngine = MultiThreadedPOWEngine()
@ -108,7 +104,7 @@ class CryptographyTest {
} }
@Test @Test
fun ensureEncryptionAndDecryptionWorks() { fun `ensure encryption and decryption works`() {
val data = crypto.randomBytes(100) val data = crypto.randomBytes(100)
val key_e = crypto.randomBytes(32) val key_e = crypto.randomBytes(32)
val iv = crypto.randomBytes(16) val iv = crypto.randomBytes(16)
@ -118,7 +114,7 @@ class CryptographyTest {
} }
@Test(expected = IllegalArgumentException::class) @Test(expected = IllegalArgumentException::class)
fun ensureDecryptionFailsWithInvalidCypherText() { fun `ensure decryption fails with invalid cypher text`() {
val data = crypto.randomBytes(128) val data = crypto.randomBytes(128)
val key_e = crypto.randomBytes(32) val key_e = crypto.randomBytes(32)
val iv = crypto.randomBytes(16) val iv = crypto.randomBytes(16)
@ -126,7 +122,7 @@ class CryptographyTest {
} }
@Test @Test
fun testMultiplication() { fun `ensure multiplication works correctly`() {
val a = crypto.randomBytes(PrivateKey.PRIVATE_KEY_SIZE) val a = crypto.randomBytes(PrivateKey.PRIVATE_KEY_SIZE)
val A = crypto.createPublicKey(a) val A = crypto.createPublicKey(a)
@ -137,7 +133,7 @@ class CryptographyTest {
} }
@Test @Test
fun ensureSignatureIsValid() { fun `ensure signature is valid`() {
val data = crypto.randomBytes(100) val data = crypto.randomBytes(100)
val privateKey = PrivateKey(false, 1, 1000, 1000) val privateKey = PrivateKey(false, 1, 1000, 1000)
val signature = crypto.getSignature(data, privateKey) val signature = crypto.getSignature(data, privateKey)
@ -145,7 +141,7 @@ class CryptographyTest {
} }
@Test @Test
fun ensureSignatureIsInvalidForTemperedData() { fun `ensure signature is invalid for tempered data`() {
val data = crypto.randomBytes(100) val data = crypto.randomBytes(100)
val privateKey = PrivateKey(false, 1, 1000, 1000) val privateKey = PrivateKey(false, 1, 1000, 1000)
val signature = crypto.getSignature(data, privateKey) val signature = crypto.getSignature(data, privateKey)