[FAB-4409] update vendored package cfssl

Updated cfssl package to the latest revision cfssl to pull the changes
required by fab-3026

Change-Id: I8b95769c254cacd2d58cd8442d1d601db143d475
Signed-off-by: Anil Ambati <[email protected]>

README.md

@@ -84,7 +84,30 @@ Run `go tool pprof -h` to view the options supported by the pprof tool. For more
 See [FVT tests](scripts/fvt/README.md) for information on functional verification test cases.
 
 
+### Updating the cfssl vendored package
+Following are the steps to update cfssl package using version 1.0.8 of govendor tool. 
 
+* Remove cfssl from vendor folder
+   * cd $GOPATH/src/github.com/hyperledger/fabric-ca/vendor
+   * govendor remove github.com/cloudflare/cfssl/...
+   * rm -rf github.com/cloudflare/cfssl/
 
-<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
-s
+* Clone cfssl repo
+   * cd $GOPATH/src/github.com/
+   * mkdir cloudflare
+   * cd cloudflare
+   * git clone https://github.com/cloudflare/cfssl.git
+
+* Add cfssl from $GOPATH to the vendor folder
+   * cd $GOPATH/src/github.com/hyperledger/fabric-ca/vendor
+   * govendor add github.com/cloudflare/cfssl/^
+   * You can optionally specify revision or tag to add a particular revision of code to the vendor folder
+      * govendor add github.com/cloudflare/cfssl/^@abc12032
+
+* Remove sqlx package from cfssl vendor folder. This is because certsql.NewAccessor (called by fabric-ca) requires sqlx.db object to be passed from the same package. If we were to have sqlx package both in fabric-ca and cfssl vendor folder, go compiler will throw an error
+   * rm -rf github.com/cloudflare/cfssl/vendor/github.com/jmoiron/sqlx
+
+* Remove the packages that are added to the fabric-ca vendor folder that are not needed by fabric-ca
+
+
+<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>

lib/certdbaccessor.go

@@ -189,6 +189,24 @@ func (d *CertDBAccessor) GetUnexpiredCertificates() (crs []certdb.CertificateRec
 	return crs, err
 }
 
+// GetRevokedAndUnexpiredCertificates returns all revoked and unexpired certificates
+func (d *CertDBAccessor) GetRevokedAndUnexpiredCertificates() ([]certdb.CertificateRecord, error) {
+	crs, err := d.accessor.GetRevokedAndUnexpiredCertificates()
+	if err != nil {
+		return nil, err
+	}
+	return crs, err
+}
+
+// GetRevokedAndUnexpiredCertificatesByLabel returns revoked and unexpired certificates matching the label
+func (d *CertDBAccessor) GetRevokedAndUnexpiredCertificatesByLabel(label string) ([]certdb.CertificateRecord, error) {
+	crs, err := d.accessor.GetRevokedAndUnexpiredCertificatesByLabel(label)
+	if err != nil {
+		return nil, err
+	}
+	return crs, err
+}
+
 // RevokeCertificatesByID updates all certificates for a given ID and marks them revoked.
 func (d *CertDBAccessor) RevokeCertificatesByID(id string, reasonCode int) (crs []CertRecord, err error) {
 	log.Debugf("DB: Revoke certificate by ID (%s)", id)

lib/dbutil/dbutil.go

@@ -98,7 +98,7 @@ func createSQLiteDBTables(datasource string) error {
 	}
 	log.Debug("Created affiliation table")
 
-	if _, err := db.Exec("CREATE TABLE IF NOT EXISTS certificates (id VARCHAR(64), serial_number bytea NOT NULL, authority_key_identifier bytea NOT NULL, ca_label bytea, status bytea NOT NULL, reason int, expiry timestamp, revoked_at timestamp, pem bytea NOT NULL, PRIMARY KEY(serial_number, authority_key_identifier))"); err != nil {
+	if _, err := db.Exec("CREATE TABLE IF NOT EXISTS certificates (id VARCHAR(64), serial_number blob NOT NULL, authority_key_identifier blob NOT NULL, ca_label blob, status blob NOT NULL, reason int, expiry timestamp, revoked_at timestamp, pem blob NOT NULL, PRIMARY KEY(serial_number, authority_key_identifier))"); err != nil {
 		return fmt.Errorf("Error creating certificates table: %s", err)
 	}
 	log.Debug("Created certificates table")