seanjmullan commented on code in PR #234: URL: https://github.com/apache/santuario-xml-security-java/pull/234#discussion_r1412318523
########## src/main/java/org/apache/xml/security/encryption/keys/RecipientKeyInfo.java: ########## @@ -0,0 +1,58 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.xml.security.encryption.keys; + +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.utils.EncryptionConstants; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + + +/** + * The RecipientKeyInfo element is used in the <code>ds:KeyInfo</code> with AgreementMethod elements. + * @see <a href="https://www.w3.org/TR/xmlenc-core1/#sec-Alg-KeyAgreement";>KeyAgreement</a>. The RecipientKeyInfo + * element extends ds:KeyInfo with namespace xenc (http://www.w3.org/2001/04/xmlenc#) amd is used to describe + * the recipient's key. + */ +public class RecipientKeyInfo extends KeyInfoEncExtension { Review Comment: Remove extra space after `class`. ########## src/main/java/org/apache/xml/security/encryption/params/ConcatKeyDerivationParameter.java: ########## @@ -0,0 +1,96 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.xml.security.encryption.params; + +import org.apache.xml.security.algorithms.MessageDigestAlgorithm; +import org.apache.xml.security.utils.EncryptionConstants; + +/** + * Class ConcatKeyDerivationParameter is used to specify parameters for the ConcatKDF key derivation algorithm. + * @see <A HREF="https://www.w3.org/TR/xmlenc-core1/#sec-ConcatKDF";>XML Encryption Syntax and Processing Version 1.1, 5.8.1 + * The ConcatKDF Key Derivation Algorithm</A> + */ +public class ConcatKeyDerivationParameter extends KeyDerivationParameter { + + private String digestAlgorithm; + private String algorithmID; + private String partyUInfo; + private String partyVInfo; + private String suppPubInfo; + private String suppPrivInfo; + + /** + * Constructor ConcatKeyDerivationParameter with specified digest algorithm + * + * @param keyBitLength the length of the derived key in bits + * @param digestAlgorithm the digest algorithm to use + */ + public ConcatKeyDerivationParameter(int keyBitLength, String digestAlgorithm) { + super(EncryptionConstants.ALGO_ID_KEYDERIVATION_CONCATKDF, keyBitLength); + setDigestAlgorithm(digestAlgorithm); + } + + public String getDigestAlgorithm() { + return digestAlgorithm; + } + + public final void setDigestAlgorithm(String digestAlgorithm) { Review Comment: Why is this one method final? ########## src/main/java/org/apache/xml/security/keys/KeyInfo.java: ########## @@ -361,6 +362,23 @@ public void add(DEREncodedKeyValue derEncodedKeyValue) { addReturnToSelf(); } + /** + * Method add AgreementMethod to the KeyInfo + * + * @param agreementMethod the AgreementMethod to be added. The AgreementMethod must extend + * class {@link org.apache.xml.security.utils.ElementProxy} + */ + public void add(AgreementMethod agreementMethod) { Review Comment: Ah, right - I missed that. I think the `EncryptionKey` methods have been in `KeyInfo` a long time, so removing them with no warning may not be a good idea. I suggest adding similar methods to `KeyInfoEncExtension` and deprecating the ones on `KeyInfo` with a future plan to eventually remove them. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@santuario.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
