@@ -7,13 +7,13 @@ import io.kotest.matchers.shouldBe
77import io.mockk.every
88import io.mockk.mockk
99import io.mockk.mockkStatic
10+ import io.mockk.spyk
1011import io.mockk.unmockkAll
1112import net.aholbrook.paseto.exception.ByteArrayLengthException
1213import net.aholbrook.paseto.exception.KeyV3Exception
1314import org.bouncycastle.asn1.ASN1Primitive
1415import org.bouncycastle.asn1.sec.ECPrivateKey
1516import org.bouncycastle.asn1.sec.SECObjectIdentifiers
16- import org.bouncycastle.asn1.x9.X9ECParameters
1717import org.bouncycastle.crypto.ec.CustomNamedCurves
1818import org.bouncycastle.crypto.params.ECDomainParameters
1919import org.bouncycastle.crypto.params.ECPrivateKeyParameters
@@ -191,12 +191,12 @@ class EcdsaTests {
191191 @Test
192192 fun `ecdsaP384Verify validates public key - handles exception during decode point` () {
193193 try {
194- val mockParams = mockk< X9ECParameters >(relaxed = true )
194+ val mockParams = spyk( CustomNamedCurves .getByOID( SECObjectIdentifiers .secp384r1) )
195195 val mockCurve = mockk<ECCurve >()
196196
197197 mockkStatic(" org.bouncycastle.crypto.ec.CustomNamedCurves" )
198198 every { CustomNamedCurves .getByOID(SECObjectIdentifiers .secp384r1) } returns mockParams
199- every { mockParams.curve } returns mockCurve
199+ every { mockParams.getCurve() } returns mockCurve
200200 every { mockCurve.decodePoint(any()) } throws IllegalArgumentException ()
201201
202202 shouldThrow<KeyV3Exception > {
@@ -217,12 +217,12 @@ class EcdsaTests {
217217 fun `ecdsaP384Verify validates public key - checks q for infinity` () {
218218 try {
219219 val curveParams = CustomNamedCurves .getByOID(SECObjectIdentifiers .secp384r1)
220- val mockParams = mockk< X9ECParameters >(relaxed = true )
220+ val mockParams = spyk(curveParams )
221221 val mockCurve = mockk<ECCurve >()
222222
223223 mockkStatic(" org.bouncycastle.crypto.ec.CustomNamedCurves" )
224224 every { CustomNamedCurves .getByOID(SECObjectIdentifiers .secp384r1) } returns mockParams
225- every { mockParams.curve } returns mockCurve
225+ every { mockParams.getCurve() } returns mockCurve
226226 every { mockCurve.decodePoint(any()) } returns curveParams.curve.infinity
227227
228228 shouldThrow<KeyV3Exception > {
@@ -242,13 +242,13 @@ class EcdsaTests {
242242 @Test
243243 fun `ecdsaP384Verify validates public key - checks q isValid` () {
244244 try {
245- val mockParams = mockk< X9ECParameters >(relaxed = true )
245+ val mockParams = spyk( CustomNamedCurves .getByOID( SECObjectIdentifiers .secp384r1) )
246246 val mockCurve = mockk<ECCurve >()
247247 val mockQ = mockk<ECPoint >()
248248
249249 mockkStatic(" org.bouncycastle.crypto.ec.CustomNamedCurves" )
250250 every { CustomNamedCurves .getByOID(SECObjectIdentifiers .secp384r1) } returns mockParams
251- every { mockParams.curve } returns mockCurve
251+ every { mockParams.getCurve() } returns mockCurve
252252 every { mockCurve.decodePoint(any()) } returns mockQ
253253 every { mockQ.isInfinity } returns false
254254 every { mockQ.isValid } returns false
0 commit comments