From 4491e28f38f4b31efb79fb550c2ea80f64d099f8 Mon Sep 17 00:00:00 2001 From: Hangyu Li Date: Thu, 8 Dec 2016 02:02:36 +0900 Subject: [PATCH] Fix Issue FAB-919 Failed to read CertificatePair The function "ReadCertificatePair" in fabric/membersrvc/ca/ecap.go indicates that only one columns-- "cert" should be returned, but instead, there are two columns-- "cert, kdfkey" being read out at function "readCertificates" of fabric/membersrvc/ca/ca.go. https://jira.hyperledger.org/browse/FAB-919 Change-Id: I2bbb865a2da47cff73dd3de344a3ddab969c21d0 Signed-off-by: Hangyu Li --- membersrvc/ca/ca.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/membersrvc/ca/ca.go b/membersrvc/ca/ca.go index 3698d9b1f7c..da79a6957c6 100644 --- a/membersrvc/ca/ca.go +++ b/membersrvc/ca/ca.go @@ -490,10 +490,10 @@ func (ca *CA) readCertificates(id string, opt ...int64) (*sql.Rows, error) { defer mutex.RUnlock() if len(opt) > 0 && opt[0] != 0 { - return ca.db.Query("SELECT cert, kdfkey FROM Certificates WHERE id=? AND timestamp=? ORDER BY usage", id, opt[0]) + return ca.db.Query("SELECT cert FROM Certificates WHERE id=? AND timestamp=? ORDER BY usage", id, opt[0]) } - return ca.db.Query("SELECT cert, kdfkey FROM Certificates WHERE id=?", id) + return ca.db.Query("SELECT cert FROM Certificates WHERE id=?", id) } func (ca *CA) readCertificateSets(id string, start, end int64) (*sql.Rows, error) { @@ -502,7 +502,7 @@ func (ca *CA) readCertificateSets(id string, start, end int64) (*sql.Rows, error mutex.RLock() defer mutex.RUnlock() - return ca.db.Query("SELECT cert, kdfKey, timestamp FROM Certificates WHERE id=? AND timestamp BETWEEN ? AND ? ORDER BY timestamp", id, start, end) + return ca.db.Query("SELECT cert, timestamp FROM Certificates WHERE id=? AND timestamp BETWEEN ? AND ? ORDER BY timestamp", id, start, end) } func (ca *CA) readCertificateByHash(hash []byte) ([]byte, error) {