Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ECKey.decodeFromDER(): Also throws IllegalArgumentException if unexpected class was read.

Browse Source 
Fixes a regression that was introduced with commit e5f14e789a.
This commit is contained in:
Andreas Schildbach
2017-08-22 12:01:34 +02:00
parent 9c49fd5692
commit 3ef5f9f2d7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/bitcoinj/core/ECKey.java
View File

@@ -578,9 +578,12 @@ public class ECKey implements EncryptableItem {
ASN1InputStream decoder = null;
try {
decoder = new ASN1InputStream(bytes);
DLSequence seq = (DLSequence) decoder.readObject();
if (seq == null)
final ASN1Primitive seqObj = decoder.readObject();
if (seqObj == null)
throw new IllegalArgumentException("Reached past end of ASN.1 stream.");
if (!(seqObj instanceof DLSequence))
throw new IllegalArgumentException("Read unexpected class: " + seqObj.getClass().getName());
final DLSequence seq = (DLSequence) seqObj;
ASN1Integer r, s;
try {
r = (ASN1Integer) seq.getObjectAt(0);