tag 1e3625e3ff03a5b44ece76fbdb0c7a2369633400
tagger The Android Open Source Project <initial-contribution@android.com> Tue Sep 06 09:27:33 2016 -0700
object 11dda1f70e04ac28129dbccbd3037169094da68c

Android 7.0.0 release 3

commit 11dda1f70e04ac28129dbccbd3037169094da68c
author Alex Klyubin <klyubin@google.com> Sat Jul 16 08:48:30 2016 -0700
committer gitbuildkicker <android-build@google.com> Sun Jul 17 09:20:34 2016 -0700
tree b98b01de29af23e3c85443e8ad391868f116d344
parent e8eab1ee19e8536e78e35cff3bb8929cb3cd08be

Fix NPEs in PKCS7 parsing introduced by last commit.

This fixes NPEs introduced by me in sun.security.pkcs.PKCS7 in commit
ddde3e18b22acdaecb883794f5c8e21f0b87bf2f. In that commit, the standard
PKCS #7 ContentInfo/SignedData parsing works fine, but the "old" and
"Netscape-style" scenarios became broken because I changed them to
use the original encoded form of certificates without requesting to
retain this form during parsing. This commit fixes the issue by
changing the "old" and "Netscape-style" parsing code to retain the
original encoded form of certificates.

Bug: 30148997
Change-Id: I63f5f9148325214e571fdf30382d671b6d3f2a63