The pki client-cert-validate has been modified to add the missing
EmailRecipient and to list the supported cert usages.

https://fedorahosted.org/pki/ticket/2376
https://fedorahosted.org/pki/ticket/2399

Pushed to master under one-liner/trivial rule.

--
Endi S. Dewata
>From 17f9722141fd5ef1c235c480707542c451c2d6f4 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edew...@redhat.com>
Date: Thu, 14 Jul 2016 23:11:46 +0200
Subject: [PATCH] Fixed cert usage list in pki client-cert-validate.

The pki client-cert-validate has been modified to add the missing
EmailRecipient and to list the supported cert usages.

https://fedorahosted.org/pki/ticket/2376
https://fedorahosted.org/pki/ticket/2399
---
 .../src/com/netscape/cmstools/client/ClientCertValidateCLI.java    | 7 ++++++-
 base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertValidateCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertValidateCLI.java
index 3988c71e25df58bef2bca2d5ff111a7d295ddcd1..50cd96f437258eaf5f7cd3dbdab4192e291576c5 100644
--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertValidateCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertValidateCLI.java
@@ -45,7 +45,10 @@ public class ClientCertValidateCLI extends CLI {
     }
 
     public void createOptions() {
-        Option option = new Option(null, "certusage", true, "Certificate usage.");
+        Option option = new Option(null, "certusage", true, "Certificate usage: " +
+                "CheckAllUsages, SSLServer, SSLServerWithStepUp, SSLClient, SSLCA, AnyCA, " +
+                "StatusResponder, ObjectSigner, UserCertImport, ProtectedObjectSigner, " +
+                "VerifyCA, EmailSigner, EmailRecipient.");
         option.setArgName("certusage");
         options.addOption(option);
     }
@@ -188,6 +191,8 @@ public class ClientCertValidateCLI extends CLI {
             cu = CryptoManager.CertificateUsage.VerifyCA;
         else if (certusage.equalsIgnoreCase("EmailSigner"))
             cu = CryptoManager.CertificateUsage.EmailSigner;
+        else if (certusage.equalsIgnoreCase("EmailRecipient"))
+            cu = CryptoManager.CertificateUsage.EmailRecipient;
 
         return cu;
     }
diff --git a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
index 5b6382e00ac7d735dca17e0ff89efa8077eed875..400ad0cdb29f5af277197fcccda8cbe242b322c0 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java
@@ -988,6 +988,8 @@ public class CertUtils {
             cu = CryptoManager.CertificateUsage.VerifyCA;
         else if (certusage.equalsIgnoreCase("EmailSigner"))
             cu = CryptoManager.CertificateUsage.EmailSigner;
+        else if (certusage.equalsIgnoreCase("EmailRecipient"))
+            cu = CryptoManager.CertificateUsage.EmailRecipient;
 
         return cu;
     }
-- 
2.5.5

_______________________________________________
Pki-devel mailing list
Pki-devel@redhat.com
https://www.redhat.com/mailman/listinfo/pki-devel

Reply via email to