Fixed bugzilla bug #493765

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1053 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

1 files changed, 26 insertions, 0 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index c0967ea18..5b36f4bc2 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -833,6 +833,13 @@ public class KeyCertUtil {
             anyExt = true;
         }
 
+        String ocspSigning = properties.getOCSPSigning();
+
+        if ((ocspSigning != null) && (ocspSigning.equals(Constants.TRUE))) {
+            ns.addOID(new ObjectIdentifier("1.3.6.1.5.5.7.3.9"));
+            anyExt = true;
+        }
+
         if (anyExt)
             ext.set(ExtendedKeyUsageExtension.NAME, ns);
     }
@@ -925,6 +932,25 @@ public class KeyCertUtil {
         }
     }
 
+    public static void setAuthInfoAccess(KeyPair keypair, 
+        CertificateExtensions ext, KeyCertData properties) throws IOException,
+            NoSuchAlgorithmException, InvalidKeyException {
+        String aia = properties.getAIA();
+
+        if ((aia != null) && (aia.equals(Constants.TRUE))) {
+            String hostname = CMS.getEENonSSLHost();
+            String port = CMS.getEENonSSLPort();
+            AuthInfoAccessExtension aiaExt = new AuthInfoAccessExtension(false);
+            if (hostname != null && port != null) {
+                String location = "http://"+hostname+":"+port+"/ca/ocsp";
+                GeneralName ocspName = new GeneralName(new URIName(location));
+                aiaExt.addAccessDescription(AuthInfoAccessExtension.METHOD_OCSP, ocspName);
+            }
+
+            ext.set(AuthInfoAccessExtension.NAME, aiaExt);
+        }
+    }
+
     public static void setAuthorityKeyIdentifier(KeyPair keypair, 
         CertificateExtensions ext, KeyCertData properties) throws IOException,
             NoSuchAlgorithmException, InvalidKeyException {