Mercurial > hg > release > icedtea7-forest-2.6 > jdk

changeset 9925:bf7ec0e106be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8231415: Better signatures in XML Reviewed-by: andrew
author alvdavi
date Tue, 15 Oct 2019 08:18:48 -0400
parents 269d16463fb2
children 2c1da2208c2b
files src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java	Thu Nov 14 15:06:11 2019 -0800
+++ b/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java	Tue Oct 15 08:18:48 2019 -0400
@@ -152,9 +152,15 @@
                 "support DOM Level 2 and be namespace aware");
         }
         if (tag.equals("KeyInfo")) {
-            return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
+            try {
+                return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
+            } catch (MarshalException me) {
+                throw me;
+            } catch (Exception e) {
+                throw new MarshalException(e);
+            }
         } else {
-            throw new MarshalException("invalid KeyInfo tag: " + tag);
+            throw new MarshalException("Invalid KeyInfo tag: " + tag);
         }
     }
 
--- a/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java	Thu Nov 14 15:06:11 2019 -0800
+++ b/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java	Tue Oct 15 08:18:48 2019 -0400
@@ -190,9 +190,15 @@
                 "support DOM Level 2 and be namespace aware");
         }
         if (tag.equals("Signature")) {
-            return new DOMXMLSignature(element, context, getProvider());
+            try {
+                return new DOMXMLSignature(element, context, getProvider());
+            } catch (MarshalException me) {
+                throw me;
+            } catch (Exception e) {
+                throw new MarshalException(e);
+            }
         } else {
-            throw new MarshalException("invalid Signature tag: " + tag);
+            throw new MarshalException("Invalid Signature tag: " + tag);
         }
     }