X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2Fca%2FX509andChain.java;h=b05747b6148c31c41d986ca9a38ff8ddb24ae568;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=5141cc62ec86bfa7a74f55efd01677c680040926;hpb=6261a19e61138e861f5c7eaf37835205f19f1fe0;p=aaf%2Fauthz.git diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java index 5141cc62..b05747b6 100644 --- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java +++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/ca/X509andChain.java @@ -7,9 +7,9 @@ * Licensed 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. @@ -30,51 +30,51 @@ import org.onap.aaf.cadi.configure.Factory; /** - * Have to put the Cert and resulting Trust Chain together. + * Have to put the Cert and resulting Trust Chain together. * Treating them separately has caused issues - * + * * @author JonathanGathman * */ public class X509andChain { - protected X509Certificate cert; - protected String[] trustChain; - - public X509andChain() { - cert = null; - trustChain = null; - } - - public X509andChain(X509Certificate cert, String[] tc) throws IOException, CertException { - this.cert = cert; - trustChain=tc; - } + protected X509Certificate cert; + protected String[] trustChain; + + public X509andChain() { + cert = null; + trustChain = null; + } + + public X509andChain(X509Certificate cert, String[] tc) { + this.cert = cert; + trustChain=tc; + } + + public X509andChain(X509Certificate cert, List chain) { + this.cert = cert; + trustChain = new String[chain.size()+1]; + chain.toArray(trustChain); + } + + + public void addTrustChainEntry(X509Certificate x509) throws IOException, CertException { + if (trustChain==null) { + trustChain = new String[] {Factory.toString(NullTrans.singleton(),x509)}; + } else { + String[] temp = new String[trustChain.length+1]; + System.arraycopy(trustChain, 0, temp, 0, trustChain.length); + temp[trustChain.length]=Factory.toString(NullTrans.singleton(),x509); + trustChain=temp; + } + } + + + public X509Certificate getX509() { + return cert; + } - public X509andChain(X509Certificate cert, List chain) throws IOException, CertException { - this.cert = cert; - trustChain = new String[chain.size()+1]; - chain.toArray(trustChain); - } - - - public void addTrustChainEntry(X509Certificate x509) throws IOException, CertException { - if(trustChain==null) { - trustChain = new String[] {Factory.toString(NullTrans.singleton(),x509)}; - } else { - String[] temp = new String[trustChain.length+1]; - System.arraycopy(trustChain, 0, temp, 0, trustChain.length); - temp[trustChain.length]=Factory.toString(NullTrans.singleton(),x509); - trustChain=temp; - } - } - + public String[] getTrustChain() { + return trustChain; + } - public X509Certificate getX509() { - return cert; - } - - public String[] getTrustChain() { - return trustChain; - } - }