diff options
author | Fraser Tweedale <ftweedal@redhat.com> | 2016-03-01 20:46:49 -0500 |
---|---|---|
committer | Fraser Tweedale <ftweedal@redhat.com> | 2016-03-03 17:19:49 -0500 |
commit | 04214b3d3405750cbbda228554c0d9f087a59170 (patch) | |
tree | 3bd51b1de1cb95d229994b0f58331a3a0cb4c9a9 /base/server/cms/src/com/netscape | |
parent | afe1d7205ae32c272e15dbf42475da4a79b5c9bc (diff) | |
download | pki-04214b3d3405750cbbda228554c0d9f087a59170.tar.gz pki-04214b3d3405750cbbda228554c0d9f087a59170.tar.xz pki-04214b3d3405750cbbda228554c0d9f087a59170.zip |
Move OCSP digest name lookup to CertID class
The OCSP digest name lookup is currently defined in IOCSPAuthority
and implemented by OCSPAuthority, but /any/ code that deals with
CertID might need to know the digest, so move the lookup there.
Also refactor the lookup to use a HashMap, and add mappings for SHA2
algorithms.
Diffstat (limited to 'base/server/cms/src/com/netscape')
-rw-r--r-- | base/server/cms/src/com/netscape/cms/ocsp/DefStore.java | 3 | ||||
-rw-r--r-- | base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java index 86e0c68b1..217c56833 100644 --- a/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java +++ b/base/server/cms/src/com/netscape/cms/ocsp/DefStore.java @@ -449,8 +449,7 @@ public class DefStore implements IDefStore, IExtendedPluginInfo { log(ILogger.LL_FAILURE, CMS.getLogMessage("OCSP_DECODE_CERT", e.toString())); return null; } - MessageDigest md = MessageDigest.getInstance( - mOCSPAuthority.getDigestName(cid.getHashAlgorithm())); + MessageDigest md = MessageDigest.getInstance(cid.getDigestName()); X509Key key = (X509Key) cert.getPublicKey(); byte digest[] = md.digest(key.getKey()); diff --git a/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java index e2e5fc493..0d2d608bf 100644 --- a/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java +++ b/base/server/cms/src/com/netscape/cms/ocsp/LDAPStore.java @@ -466,8 +466,7 @@ public class LDAPStore implements IDefStore, IExtendedPluginInfo { MessageDigest md = null; try { - md = MessageDigest.getInstance( - mOCSPAuthority.getDigestName(cid.getHashAlgorithm())); + md = MessageDigest.getInstance(cid.getDigestName()); } catch (Exception e) { } X509Key key = (X509Key) caCert.getPublicKey(); |