Fix NPEs in PKCS7 parsing introduced by last commit.

This fixes NPEs introduced by me in 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
2 files changed