Remove unused custom argument from CertificateIdentityResult.

The custom argument is only supported for PskSecretResult and
CertificateVerificationResult. It's intended for data related to the
other peer.

Signed-off-by: Achim Kraus <achim.kraus@cloudcoap.net>

scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/CertificateIdentityResult.java

@@ -44,11 +44,13 @@ public final class CertificateIdentityResult extends HandshakeResult {
 	 * @param customArgument custom argument. May be {@code null}. Passed to
 	 *            {@link ApplicationLevelInfoSupplier} by the
 	 *            {@link Handshaker}, if a {@link ApplicationLevelInfoSupplier}
-	 *            is available.
+	 *            is available. 
 	 * @throws NullPointerException if cid, private key, or chain is
 	 *             {@code null}.
 	 * @throws IllegalArgumentException if chain is empty.
+	 * @deprecated obsolete, customArgument is not used
 	 */
+	@Deprecated
 	public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, List<X509Certificate> certificateChain,
 			Object customArgument) {
 		super(cid, customArgument);
@@ -78,7 +80,9 @@ public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, List<X
 	 *            is available.
 	 * @throws NullPointerException if cid, private key, or public key is
 	 *             {@code null}.
+	 * @deprecated obsolete, customArgument is not used
 	 */
+	@Deprecated
 	public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, PublicKey publicKey,
 			Object customArgument) {
 		super(cid, customArgument);
@@ -102,14 +106,80 @@ public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, Public
 	 *            {@link Handshaker}, if a {@link ApplicationLevelInfoSupplier}
 	 *            is available.
 	 * @throws NullPointerException if cid is {@code null}.
+	 * @deprecated obsolete, customArgument is not used
 	 */
+	@Deprecated
 	public CertificateIdentityResult(ConnectionId cid, Object customArgument) {
 		super(cid, customArgument);
 		this.privateKey = null;
 		this.publicKey = null;
 		this.certificateChain = null;
 	}
 
+	/**
+	 * Create result with {@link X509Certificate}.
+	 * 
+	 * @param cid connection id
+	 * @param privateKey private key of identity.
+	 * @param certificateChain certificate chain for identity
+	 * @throws NullPointerException if cid, private key, or chain is
+	 *             {@code null}.
+	 * @throws IllegalArgumentException if chain is empty.
+	 * @since 3.12
+	 */
+	public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, List<X509Certificate> certificateChain) {
+		super(cid, null);
+		if (privateKey == null) {
+			throw new NullPointerException("Private key must not be null!");
+		}
+		if (certificateChain == null) {
+			throw new NullPointerException("Certificate chain must not be null!");
+		}
+		if (certificateChain.isEmpty()) {
+			throw new IllegalArgumentException("Certificate chain must not be empty!");
+		}
+		this.privateKey = privateKey;
+		this.publicKey = certificateChain.get(0).getPublicKey();
+		this.certificateChain = certificateChain;
+	}
+
+	/**
+	 * Create result with RawPublicKey.
+	 * 
+	 * @param cid connection id
+	 * @param privateKey private key of identity.
+	 * @param publicKey public key for identity
+	 * @throws NullPointerException if cid, private key, or public key is
+	 *             {@code null}.
+	 * @since 3.12
+	 */
+	public CertificateIdentityResult(ConnectionId cid, PrivateKey privateKey, PublicKey publicKey) {
+		super(cid, null);
+		if (privateKey == null) {
+			throw new NullPointerException("Private key must not be null!");
+		}
+		if (publicKey == null) {
+			throw new NullPointerException("Public key must not be null!");
+		}
+		this.privateKey = privateKey;
+		this.publicKey = publicKey;
+		this.certificateChain = null;
+	}
+
+	/**
+	 * Create result without matching identity.
+	 * 
+	 * @param cid connection id
+	 * @throws NullPointerException if cid is {@code null}.
+	 * @since 3.12
+	 */
+	public CertificateIdentityResult(ConnectionId cid) {
+		super(cid, null);
+		this.privateKey = null;
+		this.publicKey = null;
+		this.certificateChain = null;
+	}
+
 	/**
 	 * Get private key of certificate based identity
 	 * 

scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/Handshaker.java

@@ -2524,7 +2524,7 @@ public boolean requestCertificateIdentity(List<X500Principal> issuers, ServerNam
 		certificateIdentityPending = true;
 		CertificateIdentityResult result;
 		if (certificateIdentityProvider == null) {
-			result = new CertificateIdentityResult(connection.getConnectionId(), null);
+			result = new CertificateIdentityResult(connection.getConnectionId());
 		} else {
 			LOGGER.info("Start certificate identity.");
 			result = certificateIdentityProvider.requestCertificateIdentity(connection.getConnectionId(), isClient(),

scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/x509/KeyManagerCertificateProvider.java

@@ -386,14 +386,14 @@ && matchChainSignatureAndHashAlgorithms(signatureAndHashAlgorithms, chain)) {
 				X509Certificate[] certificateChain = keyManager.getCertificateChain(id);
 				List<X509Certificate> chain = Arrays.asList(certificateChain);
 				PrivateKey privateKey = keyManager.getPrivateKey(id);
-				return new CertificateIdentityResult(cid, privateKey, chain, id);
+				return new CertificateIdentityResult(cid, privateKey, chain);
 			} else {
 				LOGGER.debug("[{}]: {} no matching credentials left!", id, role);
 			}
 		} else {
 			LOGGER.debug("[{}]: no matching credentials", id);
 		}
-		return new CertificateIdentityResult(cid, null);
+		return new CertificateIdentityResult(cid);
 	}
 
 	@Override

scandium-core/src/main/java/org/eclipse/californium/scandium/dtls/x509/SingleCertificateProvider.java

@@ -227,9 +227,9 @@ public CertificateIdentityResult requestCertificateIdentity(ConnectionId cid, bo
 			List<CertificateKeyAlgorithm> certificateKeyAlgorithms,
 			List<SignatureAndHashAlgorithm> signatureAndHashAlgorithms, List<SupportedGroup> curves) {
 		if (certificateChain != null) {
-			return new CertificateIdentityResult(cid, privateKey, certificateChain, null);
+			return new CertificateIdentityResult(cid, privateKey, certificateChain);
 		} else {
-			return new CertificateIdentityResult(cid, privateKey, publicKey, null);
+			return new CertificateIdentityResult(cid, privateKey, publicKey);
 		}
 	}