8282220: contentType should not be a PKCS7's member

Reviewed-by: xuelei

Author: John Jiang

src/java.base/share/classes/sun/security/pkcs/PKCS7.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,8 +53,6 @@
  */
 public class PKCS7 {
 
-    private ObjectIdentifier contentType;
-
     // the ASN.1 members for a signedData (and other) contentTypes
     private BigInteger version = null;
     private AlgorithmId[] digestAlgorithmIds = null;
@@ -167,7 +165,7 @@ private void parse(DerInputStream derin, boolean oldStyle)
         throws IOException
     {
         ContentInfo block = new ContentInfo(derin, oldStyle);
-        contentType = block.contentType;
+        ObjectIdentifier contentType = block.contentType;
         DerValue content = block.getContent();
 
         if (contentType.equals(ContentInfo.SIGNED_DATA_OID)) {
@@ -240,14 +238,10 @@ private void parseNetscapeCertChain(DerValue val)
                     bais.close();
                     bais = null;
                 }
-            } catch (CertificateException ce) {
+            } catch (CertificateException | IOException ce) {
                 ParsingException pe = new ParsingException(ce.getMessage());
                 pe.initCause(ce);
                 throw pe;
-            } catch (IOException ioe) {
-                ParsingException pe = new ParsingException(ioe.getMessage());
-                pe.initCause(ioe);
-                throw pe;
             } finally {
                 if (bais != null)
                     bais.close();
@@ -330,14 +324,10 @@ private void parseSignedData(DerValue val)
                         }
                         count++;
                     }
-                } catch (CertificateException ce) {
+                } catch (CertificateException | IOException ce) {
                     ParsingException pe = new ParsingException(ce.getMessage());
                     pe.initCause(ce);
                     throw pe;
-                } catch (IOException ioe) {
-                    ParsingException pe = new ParsingException(ioe.getMessage());
-                    pe.initCause(ioe);
-                    throw pe;
                 } finally {
                     if (bais != null)
                         bais.close();
@@ -444,14 +434,10 @@ private void parseOldSignedData(DerValue val)
                     bais.close();
                     bais = null;
                 }
-            } catch (CertificateException ce) {
+            } catch (CertificateException | IOException ce) {
                 ParsingException pe = new ParsingException(ce.getMessage());
                 pe.initCause(ce);
                 throw pe;
-            } catch (IOException ioe) {
-                ParsingException pe = new ParsingException(ioe.getMessage());
-                pe.initCause(ioe);
-                throw pe;
             } finally {
                 if (bais != null)
                     bais.close();