Revendor fabric's bccsp into fabric-ca

See https://jira.hyperledger.org/browse/FAB-1797 The bccsp code in fabric moved to fabric/bccsp, so this change set removes and revendors the bccsp code from fabric. It also contains the import changes matching the moved code. Change-Id: Id80ceaf583ff33cb484885c12ea5950477b804d3 Signed-off-by: Keith Smith <bksmith@us.ibm.com>
hyperledger · Jan 21, 2017 · aa5fb82 · aa5fb82
1 parent 248e0c6
commit aa5fb82
Show file tree

Hide file tree

Showing 50 changed files with 2,334 additions and 1,231 deletions.
diff --git a/cli/server/init.go b/cli/server/init.go
@@ -26,7 +26,7 @@ import (
 	"github.com/cloudflare/cfssl/csr"
 	"github.com/cloudflare/cfssl/initca"
 	"github.com/cloudflare/cfssl/log"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/factory"
+	"github.com/hyperledger/fabric/bccsp/factory"
 )
 
 var initUsageText = `fabric-ca server init CSRJSON -- generates a new private key and self-signed certificate

diff --git a/cli/server/server.go b/cli/server/server.go
@@ -51,7 +51,7 @@ import (
 	"github.com/hyperledger/fabric-ca/cli/server/spi"
 	libcsp "github.com/hyperledger/fabric-ca/lib/csp"
 	"github.com/hyperledger/fabric-ca/util"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 	"github.com/jmoiron/sqlx"
 )
 

diff --git a/lib/csp/csp.go b/lib/csp/csp.go
@@ -24,10 +24,10 @@ import (
 	"os"
 	"path"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/factory"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/signer"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/sw"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/factory"
+	"github.com/hyperledger/fabric/bccsp/signer"
+	"github.com/hyperledger/fabric/bccsp/sw"
 )
 
 const (

diff --git a/lib/csp/csp_test.go b/lib/csp/csp_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/hyperledger/fabric-ca/lib/csp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 func TestBCCSP(t *testing.T) {

diff --git a/lib/tcert/keytree.go b/lib/tcert/keytree.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
+	"github.com/hyperledger/fabric/bccsp"
 )
 
 /*

diff --git a/lib/tcert/keytree_test.go b/lib/tcert/keytree_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/cloudflare/cfssl/log"
-	"github.com/hyperledger/fabric/core/crypto/bccsp"
-	"github.com/hyperledger/fabric/core/crypto/bccsp/factory"
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/factory"
 )
 
 func TestKeyTree(t *testing.T) {

diff --git a/...edger/fabric/core/crypto/bccsp/aesopts.go → ...b.com/hyperledger/fabric/bccsp/aesopts.go b/...edger/fabric/core/crypto/bccsp/aesopts.go → ...b.com/hyperledger/fabric/bccsp/aesopts.go
diff --git a/...rledger/fabric/core/crypto/bccsp/bccsp.go → ...hub.com/hyperledger/fabric/bccsp/bccsp.go b/...rledger/fabric/core/crypto/bccsp/bccsp.go → ...hub.com/hyperledger/fabric/bccsp/bccsp.go
diff --git a/...ger/fabric/core/crypto/bccsp/ecdsaopts.go → ...com/hyperledger/fabric/bccsp/ecdsaopts.go b/...ger/fabric/core/crypto/bccsp/ecdsaopts.go → ...com/hyperledger/fabric/bccsp/ecdsaopts.go
diff --git a/...bric/core/crypto/bccsp/factory/factory.go → ...perledger/fabric/bccsp/factory/factory.go b/...bric/core/crypto/bccsp/factory/factory.go → ...perledger/fabric/bccsp/factory/factory.go
diff --git a/.../fabric/core/crypto/bccsp/factory/opts.go → .../hyperledger/fabric/bccsp/factory/opts.go b/.../fabric/core/crypto/bccsp/factory/opts.go → .../hyperledger/fabric/bccsp/factory/opts.go
diff --git a/vendor/github.com/hyperledger/fabric/bccsp/factory/pkcs11factory.go b/vendor/github.com/hyperledger/fabric/bccsp/factory/pkcs11factory.go
diff --git a/...ic/core/crypto/bccsp/factory/swfactory.go → ...rledger/fabric/bccsp/factory/swfactory.go b/...ic/core/crypto/bccsp/factory/swfactory.go → ...rledger/fabric/bccsp/factory/swfactory.go
diff --git a/...dger/fabric/core/crypto/bccsp/hashopts.go → ....com/hyperledger/fabric/bccsp/hashopts.go b/...dger/fabric/core/crypto/bccsp/hashopts.go → ....com/hyperledger/fabric/bccsp/hashopts.go
diff --git a/...dger/fabric/core/crypto/bccsp/keystore.go → ....com/hyperledger/fabric/bccsp/keystore.go b/...dger/fabric/core/crypto/bccsp/keystore.go → ....com/hyperledger/fabric/bccsp/keystore.go
diff --git a/...erledger/fabric/core/crypto/bccsp/opts.go → ...thub.com/hyperledger/fabric/bccsp/opts.go b/...erledger/fabric/core/crypto/bccsp/opts.go → ...thub.com/hyperledger/fabric/bccsp/opts.go
diff --git a/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/aes.go b/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/aes.go
diff --git a/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/aeskey.go b/vendor/github.com/hyperledger/fabric/bccsp/pkcs11/aeskey.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ import ( @@
     	"fmt"
     	"strings"
-    	"github.com/hyperledger/fabric/core/crypto/bccsp"
+    	"github.com/hyperledger/fabric/bccsp"
     )
     /*
@@ Expand Down @@