ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-22 06:17:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove unused vars + and change set/get with indexing operator. (#358)

Browse Source
This commit is contained in:
Konstantinos Chalkias 2017-03-15 17:10:55 +00:00 committed by GitHub
parent 6a6698b598
commit 9db773d17c
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
core/src/test/kotlin/net/corda/core/crypto/CryptoUtilsTest.kt
View File

@ -45,22 +45,22 @@ class CryptoUtilsTest {
val sphincsKeyPair = Crypto.generateKeyPair("SPHINCS-256_SHA512") val sphincsKeyPair = Crypto.generateKeyPair("SPHINCS-256_SHA512")
// not null private keys // not null private keys
assertNotNull(rsaKeyPair.private); assertNotNull(rsaKeyPair.private)
assertNotNull(ecdsaKKeyPair.private); assertNotNull(ecdsaKKeyPair.private)
assertNotNull(ecdsaRKeyPair.private); assertNotNull(ecdsaRKeyPair.private)
assertNotNull(eddsaKeyPair.private); assertNotNull(eddsaKeyPair.private)
assertNotNull(sphincsKeyPair.private); assertNotNull(sphincsKeyPair.private)
// not null public keys // not null public keys
assertNotNull(rsaKeyPair.public); assertNotNull(rsaKeyPair.public)
assertNotNull(ecdsaKKeyPair.public); assertNotNull(ecdsaKKeyPair.public)
assertNotNull(ecdsaRKeyPair.public); assertNotNull(ecdsaRKeyPair.public)
assertNotNull(eddsaKeyPair.public); assertNotNull(eddsaKeyPair.public)
assertNotNull(sphincsKeyPair.public); assertNotNull(sphincsKeyPair.public)
// fail on unsupported algorithm // fail on unsupported algorithm
try { try {
val wrongKeyPair = Crypto.generateKeyPair("WRONG_ALG") Crypto.generateKeyPair("WRONG_ALG")
fail() fail()
} catch (e: Exception) { } catch (e: Exception) {
// expected // expected
@ -117,15 +117,15 @@ class CryptoUtilsTest {
// test on malformed signatures (even if they change for 1 bit) // test on malformed signatures (even if they change for 1 bit)
for (i in 0..signedData.size - 1) { for (i in 0..signedData.size - 1) {
val b = signedData.get(i) val b = signedData[i]
signedData.set(i,b.inc()) signedData[i] = b.inc()
try { try {
keyPair.verify(signedData, testBytes) keyPair.verify(signedData, testBytes)
fail() fail()
} catch (e: Exception) { } catch (e: Exception) {
// expected // expected
} }
signedData.set(i,b.dec()) signedData[i] = b.dec()
} }
} }
@ -176,7 +176,7 @@ class CryptoUtilsTest {
assertTrue(verificationBig) assertTrue(verificationBig)
// test on malformed signatures (even if they change for 1 bit) // test on malformed signatures (even if they change for 1 bit)
signedData.set(0,signedData[0].inc()) signedData[0] = signedData[0].inc()
try { try {
keyPair.verify(signedData, testBytes) keyPair.verify(signedData, testBytes)
fail() fail()
@ -232,7 +232,7 @@ class CryptoUtilsTest {
assertTrue(verificationBig) assertTrue(verificationBig)
// test on malformed signatures (even if they change for 1 bit) // test on malformed signatures (even if they change for 1 bit)
signedData.set(0, signedData[0].inc()) signedData[0] = signedData[0].inc()
try { try {
keyPair.verify(signedData, testBytes) keyPair.verify(signedData, testBytes)
fail() fail()
@ -288,7 +288,7 @@ class CryptoUtilsTest {
assertTrue(verificationBig) assertTrue(verificationBig)
// test on malformed signatures (even if they change for 1 bit) // test on malformed signatures (even if they change for 1 bit)
signedData.set(0, signedData[0].inc()) signedData[0] = signedData[0].inc()
try { try {
keyPair.verify(signedData, testBytes) keyPair.verify(signedData, testBytes)
fail() fail()
@ -344,7 +344,7 @@ class CryptoUtilsTest {
assertTrue(verificationBig) assertTrue(verificationBig)
// test on malformed signatures (even if they change for 1 bit) // test on malformed signatures (even if they change for 1 bit)
signedData.set(0, signedData[0].inc()) signedData[0] = signedData[0].inc()
try { try {
keyPair.verify(signedData, testBytes) keyPair.verify(signedData, testBytes)
fail() fail()
@ -357,7 +357,7 @@ class CryptoUtilsTest {
@Test @Test
fun `Check supported algorithms`() { fun `Check supported algorithms`() {
val algList : List<String> = Crypto.listSupportedSignatureSchemes() val algList : List<String> = Crypto.listSupportedSignatureSchemes()
val expectedAlgSet = setOf<String>("RSA_SHA256","ECDSA_SECP256K1_SHA256", "ECDSA_SECP256R1_SHA256", "EDDSA_ED25519_SHA512","SPHINCS-256_SHA512") val expectedAlgSet = setOf("RSA_SHA256","ECDSA_SECP256K1_SHA256", "ECDSA_SECP256R1_SHA256", "EDDSA_ED25519_SHA512","SPHINCS-256_SHA512")
assertTrue { Sets.symmetricDifference(expectedAlgSet,algList.toSet()).isEmpty(); } assertTrue { Sets.symmetricDifference(expectedAlgSet,algList.toSet()).isEmpty(); }
} }
@ -601,12 +601,12 @@ class CryptoUtilsTest {
@Test @Test
fun `Failure test between K1 and R1 keys`() { fun `Failure test between K1 and R1 keys`() {
val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256") val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256")
val (privK1, pubK1) = keyPairK1 val privK1= keyPairK1.private
val encodedPrivK1 = privK1.encoded val encodedPrivK1 = privK1.encoded
val decodedPrivK1 = Crypto.decodePrivateKey(encodedPrivK1) val decodedPrivK1 = Crypto.decodePrivateKey(encodedPrivK1)
val keyPairR1 = Crypto.generateKeyPair("ECDSA_SECP256R1_SHA256") val keyPairR1 = Crypto.generateKeyPair("ECDSA_SECP256R1_SHA256")
val (privR1, pubR1) = keyPairR1 val privR1 = keyPairR1.private
val encodedPrivR1 = privR1.encoded val encodedPrivR1 = privR1.encoded
val decodedPrivR1 = Crypto.decodePrivateKey(encodedPrivR1) val decodedPrivR1 = Crypto.decodePrivateKey(encodedPrivR1)
@ -616,7 +616,7 @@ class CryptoUtilsTest {
@Test @Test
fun `Decoding Failure on randomdata as key`() { fun `Decoding Failure on randomdata as key`() {
val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256") val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256")
val (privK1, pubK1) = keyPairK1 val privK1 = keyPairK1.private
val encodedPrivK1 = privK1.encoded val encodedPrivK1 = privK1.encoded
// Test on random encoded bytes. // Test on random encoded bytes.
@ -626,7 +626,7 @@ class CryptoUtilsTest {
// fail on fake key. // fail on fake key.
try { try {
val decodedFake = Crypto.decodePrivateKey(fakeEncodedKey) Crypto.decodePrivateKey(fakeEncodedKey)
fail() fail()
} catch (e: Exception) { } catch (e: Exception) {
// expected // expected
@ -636,21 +636,20 @@ class CryptoUtilsTest {
@Test @Test
fun `Decoding Failure on malformed keys`() { fun `Decoding Failure on malformed keys`() {
val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256") val keyPairK1 = Crypto.generateKeyPair("ECDSA_SECP256K1_SHA256")
val (privK1, pubK1) = keyPairK1 val privK1 = keyPairK1.private
val encodedPrivK1 = privK1.encoded val encodedPrivK1 = privK1.encoded
// fail on malformed key. // fail on malformed key.
for (i in 0..encodedPrivK1.size - 1) { for (i in 0..encodedPrivK1.size - 1) {
val b = encodedPrivK1.get(i) val b = encodedPrivK1[i]
encodedPrivK1.set(i,b.inc()) encodedPrivK1[i] = b.inc()
try { try {
val decodedFake = Crypto.decodePrivateKey(encodedPrivK1) Crypto.decodePrivateKey(encodedPrivK1)
println("OK")
fail() fail()
} catch (e: Exception) { } catch (e: Exception) {
// expected // expected
} }
encodedPrivK1.set(i,b.dec()) encodedPrivK1[i] = b.dec()
} }
} }
} }