equal
deleted
inserted
replaced
30 import java.security.cert.CertificateException; |
30 import java.security.cert.CertificateException; |
31 import java.security.cert.CertPathValidatorException; |
31 import java.security.cert.CertPathValidatorException; |
32 import java.security.cert.PKIXCertPathChecker; |
32 import java.security.cert.PKIXCertPathChecker; |
33 import java.security.cert.TrustAnchor; |
33 import java.security.cert.TrustAnchor; |
34 import java.security.cert.X509Certificate; |
34 import java.security.cert.X509Certificate; |
35 import java.security.interfaces.DSAPublicKey; |
|
36 import java.util.ArrayList; |
35 import java.util.ArrayList; |
37 import java.util.HashSet; |
36 import java.util.HashSet; |
38 import java.util.List; |
37 import java.util.List; |
39 import java.util.ListIterator; |
38 import java.util.ListIterator; |
40 import java.util.Set; |
39 import java.util.Set; |
285 subjectDN = cert.getSubjectX500Principal(); |
284 subjectDN = cert.getSubjectX500Principal(); |
286 |
285 |
287 /* check for key needing to inherit alg parameters */ |
286 /* check for key needing to inherit alg parameters */ |
288 X509CertImpl icert = X509CertImpl.toImpl(cert); |
287 X509CertImpl icert = X509CertImpl.toImpl(cert); |
289 PublicKey newKey = cert.getPublicKey(); |
288 PublicKey newKey = cert.getPublicKey(); |
290 if (newKey instanceof DSAPublicKey && |
289 if (PKIX.isDSAPublicKeyWithoutParams(newKey)) { |
291 (((DSAPublicKey)newKey).getParams() == null)) { |
|
292 newKey = BasicChecker.makeInheritedParamsKey(newKey, pubKey); |
290 newKey = BasicChecker.makeInheritedParamsKey(newKey, pubKey); |
293 } |
291 } |
294 |
292 |
295 /* update subject public key */ |
293 /* update subject public key */ |
296 pubKey = newKey; |
294 pubKey = newKey; |