ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 07:30:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

NOTICK Do not use Security.addProvider(BouncyCastleProvider()) in tests (#6250) (#6700)

Browse Source 
Do not use Security.addProvider(BouncyCastleProvider()) in tests, to avoid disruptions of other tests.

Co-authored-by: Denis Rekalov <denis.rekalov@r3.com>
This commit is contained in:
Ross Nicoll 2020-09-11 16:50:12 +01:00 committed by GitHub
parent 2198524315
commit df7b1bccd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core-tests/src/test/kotlin/net/corda/coretests/crypto/X509NameConstraintsTest.kt
View File

@ -12,7 +12,6 @@ import org.bouncycastle.asn1.x509.GeneralSubtree
import org.bouncycastle.asn1.x509.NameConstraints import org.bouncycastle.asn1.x509.NameConstraints
import org.bouncycastle.jce.provider.BouncyCastleProvider import org.bouncycastle.jce.provider.BouncyCastleProvider
import org.junit.Test import org.junit.Test
import java.security.Security
import java.security.UnrecoverableKeyException import java.security.UnrecoverableKeyException
import java.security.cert.CertPathValidator import java.security.cert.CertPathValidator
import java.security.cert.CertPathValidatorException import java.security.cert.CertPathValidatorException
@ -95,7 +94,8 @@ class X509NameConstraintsTest {
@Test @Test
fun `x500 name with correct cn and extra attribute`() { fun `x500 name with correct cn and extra attribute`() {
Security.addProvider(BouncyCastleProvider()) // Do not use Security.addProvider(BouncyCastleProvider()) to avoid EdDSA signature disruption in other tests.
Crypto.findProvider(BouncyCastleProvider.PROVIDER_NAME)
val acceptableNames = listOf("CN=Bank A TLS, UID=", "O=Bank A") val acceptableNames = listOf("CN=Bank A TLS, UID=", "O=Bank A")
.map { GeneralSubtree(GeneralName(X500Name(it))) }.toTypedArray() .map { GeneralSubtree(GeneralName(X500Name(it))) }.toTypedArray()

4
node/src/integration-test/kotlin/net/corda/node/amqp/CertificateRevocationListNodeTests.kt
View File

@ -54,7 +54,6 @@ import java.math.BigInteger
import java.net.InetSocketAddress import java.net.InetSocketAddress
import java.security.KeyPair import java.security.KeyPair
import java.security.PrivateKey import java.security.PrivateKey
import java.security.Security
import java.security.cert.X509CRL import java.security.cert.X509CRL
import java.security.cert.X509Certificate import java.security.cert.X509Certificate
import java.util.* import java.util.*
@ -113,7 +112,8 @@ class CertificateRevocationListNodeTests {
@Before @Before
fun setUp() { fun setUp() {
Security.addProvider(BouncyCastleProvider()) // Do not use Security.addProvider(BouncyCastleProvider()) to avoid EdDSA signature disruption in other tests.
Crypto.findProvider(BouncyCastleProvider.PROVIDER_NAME)
revokedNodeCerts.clear() revokedNodeCerts.clear()
server = CrlServer(NetworkHostAndPort("localhost", 0)) server = CrlServer(NetworkHostAndPort("localhost", 0))
server.start() server.start()