ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-28 15:02:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Correct exceptions thrown from checkSignaturesAreValid()

Browse Source 
checkSignaturesAreValid() calls TransactionSignature.verify(), which throws InvalidKeyException but
checkSignaturesAreValid() did not indicate it could throw InvalidKeyException.
This commit is contained in:
Ross Nicoll 2017-08-11 10:53:20 +01:00
parent 31df43bd76
commit f9552a0d3e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/kotlin/net/corda/core/transactions/TransactionWithSignatures.kt
View File

@ -5,6 +5,7 @@ import net.corda.core.crypto.TransactionSignature
import net.corda.core.crypto.isFulfilledBy import net.corda.core.crypto.isFulfilledBy
import net.corda.core.transactions.SignedTransaction.SignaturesMissingException import net.corda.core.transactions.SignedTransaction.SignaturesMissingException
import net.corda.core.utilities.toNonEmptySet import net.corda.core.utilities.toNonEmptySet
import java.security.InvalidKeyException
import java.security.PublicKey import java.security.PublicKey
import java.security.SignatureException import java.security.SignatureException
@ -52,9 +53,10 @@ interface TransactionWithSignatures : NamedByHash {
* corrupt. If you use this function directly you'll need to do the other checks yourself. Probably you * corrupt. If you use this function directly you'll need to do the other checks yourself. Probably you
* want [verifySignatures] instead. * want [verifySignatures] instead.
* *
* @throws InvalidKeyException if the key on a signature is invalid.
* @throws SignatureException if a signature fails to verify. * @throws SignatureException if a signature fails to verify.
*/ */
@Throws(SignatureException::class) @Throws(InvalidKeyException::class, SignatureException::class)
fun checkSignaturesAreValid() { fun checkSignaturesAreValid() {
for (sig in sigs) { for (sig in sigs) {
sig.verify(id) sig.verify(id)

3
docs/source/example-code/src/main/java/net/corda/docs/FlowCookbookJava.java
View File

@ -26,6 +26,7 @@ import net.corda.testing.contracts.DummyState;
import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.X500Name;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.security.GeneralSecurityException;
import java.security.PublicKey; import java.security.PublicKey;
import java.security.SignatureException; import java.security.SignatureException;
import java.time.Duration; import java.time.Duration;
@ -506,7 +507,7 @@ public class FlowCookbookJava {
twiceSignedTx.checkSignaturesAreValid(); twiceSignedTx.checkSignaturesAreValid();
// DOCEND 37 // DOCEND 37
} catch (SignatureException e) { } catch (GeneralSecurityException e) {
// Handle this as required. // Handle this as required.
} }