--- a/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java Tue Apr 09 12:05:27 2013 +0400
+++ b/jdk/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java Mon Apr 22 11:23:33 2013 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013 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
@@ -74,11 +74,7 @@
if (ks == null) {
throw new NullPointerException("key selector is null");
}
- if (node == null) {
- throw new NullPointerException("node is null");
- }
- setKeySelector(ks);
- this.node = node;
+ init(node, ks);
}
/**
@@ -97,11 +93,20 @@
if (validatingKey == null) {
throw new NullPointerException("validatingKey is null");
}
+ init(node, KeySelector.singletonKeySelector(validatingKey));
+ }
+
+ private void init(Node node, KeySelector ks) {
if (node == null) {
throw new NullPointerException("node is null");
}
- setKeySelector(KeySelector.singletonKeySelector(validatingKey));
+
this.node = node;
+ super.setKeySelector(ks);
+ if (System.getSecurityManager() != null) {
+ super.setProperty("org.jcp.xml.dsig.secureValidation",
+ Boolean.TRUE);
+ }
}
/**