infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-15 10:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

8287246: DSAKeyValue should check for missing params instead of relying on KeyFactory provider

Browse Source 
Reviewed-by: weijun
This commit is contained in:
Sean Mullan 2022-05-26 12:36:21 +00:00
parent f58c9a659b
commit f235955eef
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java
View File

@ -21,7 +21,7 @@
* under the License.
*/
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
*/
package org.jcp.xml.dsig.internal.dom;
@ -300,35 +300,23 @@ public abstract class DOMKeyValue<K extends PublicKey> extends DOMStructure impl
("unable to create DSA KeyFactory: " + e.getMessage());
}
}
Element curElem = DOMUtils.getFirstChildElement(kvtElem);
if (curElem == null) {
throw new MarshalException("KeyValue must contain at least one type");
}
// check for P and Q
BigInteger p = null;
BigInteger q = null;
if ("P".equals(curElem.getLocalName()) && XMLSignature.XMLNS.equals(curElem.getNamespaceURI())) {
p = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem, "Q", XMLSignature.XMLNS);
q = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem);
}
BigInteger g = null;
if (curElem != null
&& "G".equals(curElem.getLocalName()) && XMLSignature.XMLNS.equals(curElem.getNamespaceURI())) {
g = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem, "Y", XMLSignature.XMLNS);
}
BigInteger y = null;
if (curElem != null) {
y = decode(curElem);
curElem = DOMUtils.getNextSiblingElement(curElem);
}
//if (curElem != null && "J".equals(curElem.getLocalName())) {
//j = new DOMCryptoBinary(curElem.getFirstChild());
// curElem = DOMUtils.getNextSiblingElement(curElem);
//}
//@@@ do we care about j, pgenCounter or seed?
// P, Q, and G are optional according to the XML Signature
// Recommendation as they might be known from application context,
// but this implementation does not provide a mechanism or API for
// an application to supply the missing parameters, so they are
// required to be specified.
Element curElem =
DOMUtils.getFirstChildElement(kvtElem, "P", XMLSignature.XMLNS);
BigInteger p = decode(curElem);
curElem =
DOMUtils.getNextSiblingElement(curElem, "Q", XMLSignature.XMLNS);
BigInteger q = decode(curElem);
curElem =
DOMUtils.getNextSiblingElement(curElem, "G", XMLSignature.XMLNS);
BigInteger g = decode(curElem);
curElem =
DOMUtils.getNextSiblingElement(curElem, "Y", XMLSignature.XMLNS);
BigInteger y = decode(curElem);
DSAPublicKeySpec spec = new DSAPublicKeySpec(y, p, q, g);
return (DSAPublicKey) generatePublicKey(dsakf, spec);
}