You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/20 15:17:12 UTC

[2/3] git commit: updated refs/heads/4.3 to 5cd0d25

CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts)

Signed-off-by: Will Stevens <ws...@cloudops.com>
(cherry picked from commit 8ea79020751dffe9f84ab1b17a943bd385f9a50c)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/56d8b173
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/56d8b173
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/56d8b173

Branch: refs/heads/4.3
Commit: 56d8b173a0910d73a292fac2405d8c1f3dc1d37a
Parents: 9258b83
Author: Syed <sa...@cloudops.com>
Authored: Fri Oct 31 23:24:44 2014 -0400
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 20 19:38:47 2014 +0530

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/response/SslCertResponse.java  | 8 --------
 .../org/apache/cloudstack/network/lb/CertServiceImpl.java    | 1 -
 2 files changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56d8b173/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
index 3e8b7ae..44ce0c8 100644
--- a/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SslCertResponse.java
@@ -37,10 +37,6 @@ public class SslCertResponse extends BaseResponse {
     @Param(description = "certificate")
     private String certificate;
 
-    @SerializedName(ApiConstants.PRIVATE_KEY)
-    @Param(description = "private key")
-    private String privatekey;
-
     @SerializedName(ApiConstants.ACCOUNT)
     @Param(description = "account for the certificate")
     private String accountName;
@@ -68,10 +64,6 @@ public class SslCertResponse extends BaseResponse {
         this.certificate = cert;
     }
 
-    public void setPrivatekey(String key) {
-        this.privatekey = key;
-    }
-
     public void setAccountName(String accountName) {
         this.accountName = accountName;
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/56d8b173/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
index 2beff68..87b6b84 100644
--- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
@@ -278,7 +278,6 @@ public class CertServiceImpl implements  CertService {
         response.setObjectName("sslcert");
         response.setId(cert.getUuid());
         response.setCertificate(cert.getCertificate());
-        response.setPrivatekey(cert.getKey());
         response.setFingerprint(cert.getFingerPrint());
         response.setAccountName(account.getAccountName());