diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-08-12 02:23:18 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-08-12 02:35:37 +0200 |
commit | d27d4600784acb49c42764d02835dedf3ee87227 (patch) | |
tree | 22b6f1a3bdb6cfa31563c302422341fb58202527 | |
parent | ca8f4650b6810245a4a7933070d4d8b31d0d6de4 (diff) | |
download | pki-d27d4600784acb49c42764d02835dedf3ee87227.tar.gz pki-d27d4600784acb49c42764d02835dedf3ee87227.tar.xz pki-d27d4600784acb49c42764d02835dedf3ee87227.zip |
Removed PKCS #7 from add user cert dialog in TPS UI.
The dialog box for adding user certificate in TPS UI has been
modified to no longer mention PKCS #7. The REST service itself
still accepts PKCS #7, but it should be cleaned up in the future.
https://fedorahosted.org/pki/ticket/2437
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/UserService.java | 2 | ||||
-rw-r--r-- | base/tps/shared/webapps/tps/ui/user-certs.html | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java index 0893c4bed..1f8e9fa31 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java @@ -863,6 +863,8 @@ public class UserService extends PKIService implements UserResource { } if (cert == null) { + // TODO: Remove this code. Importing PKCS #7 is not supported. + // cert chain direction boolean assending = true; diff --git a/base/tps/shared/webapps/tps/ui/user-certs.html b/base/tps/shared/webapps/tps/ui/user-certs.html index 049583e97..04593f346 100644 --- a/base/tps/shared/webapps/tps/ui/user-certs.html +++ b/base/tps/shared/webapps/tps/ui/user-certs.html @@ -93,7 +93,7 @@ <input name="userID" readonly="readonly"><br> <label>Certificate</label> <textarea name="encoded" rows="20" cols="80"></textarea><br> - Enter a PEM certificate or PKCS #7 data. + Enter a PEM certificate. </fieldset> </div> <div class="modal-footer"> |