archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8315042: NPE in PKCS7.parseOldSignedData

Browse source 
Reviewed-by: valeriep, weijun
This commit is contained in:
Mark Powers 2023-10-04 00:23:42 +00:00 • committed by Valerie Peng
parent f7deaf4bef
commit 8c0d026d0f
2 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/sun/security/pkcs/PKCS7.java
View file

@ -152,6 +152,10 @@ public class PKCS7 {
ObjectIdentifier contentType = block.contentType;
DerValue content = block.getContent();
if (content == null) {
throw new ParsingException("content is null");
}
if (contentType.equals(ContentInfo.SIGNED_DATA_OID)) {
parseSignedData(content);
} else if (contentType.equals(ContentInfo.OLD_SIGNED_DATA_OID)) {