[FAB-3772] Improve coverage for PKCS11 package (3 of 3)

This is the third of three patches to improve the
coverage of the bccsp/pkcs11 package.

This patch builds on top of
https://gerrit.hyperledger.org/r/#/c/9441

Change-Id: I7748a11dbf1883fe6bc42357b3b57d74d1f22d5d
Signed-off-by: John Harrison <[email protected]>

bccsp/pkcs11/keyimport_test.go

@@ -0,0 +1,118 @@
+/*
+Copyright IBM Corp. 2017 All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+		 http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package pkcs11
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"testing"
+
+	"github.com/hyperledger/fabric/bccsp"
+	"github.com/hyperledger/fabric/bccsp/utils"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestECDSAPKIXPublicKeyImportOptsKeyImporter(t *testing.T) {
+	ki := currentBCCSP
+
+	_, err := ki.KeyImport("Hello World", &bccsp.ECDSAPKIXPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[ECDSAPKIXPublicKeyImportOpts] Invalid raw material. Expected byte array.")
+
+	_, err = ki.KeyImport("Hello World", nil)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid Opts parameter. It must not be nil.")
+
+	_, err = ki.KeyImport(nil, &bccsp.ECDSAPKIXPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid raw. Cannot be nil.")
+
+	_, err = ki.KeyImport([]byte(nil), &bccsp.ECDSAPKIXPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[ECDSAPKIXPublicKeyImportOpts] Invalid raw. It must not be nil.")
+
+	_, err = ki.KeyImport([]byte{0}, &bccsp.ECDSAPKIXPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed converting PKIX to ECDSA public key")
+
+	k, err := rsa.GenerateKey(rand.Reader, 512)
+	assert.NoError(t, err)
+	raw, err := utils.PublicKeyToDER(&k.PublicKey)
+	assert.NoError(t, err)
+	_, err = ki.KeyImport(raw, &bccsp.ECDSAPKIXPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed casting to ECDSA public key. Invalid raw material.")
+}
+
+func TestECDSAPrivateKeyImportOptsKeyImporter(t *testing.T) {
+	ki := currentBCCSP
+	ki.(*impl).noPrivImport = false
+
+	_, err := ki.KeyImport("Hello World", &bccsp.ECDSAPrivateKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[ECDSADERPrivateKeyImportOpts] Invalid raw material. Expected byte array.")
+
+	_, err = ki.KeyImport(nil, &bccsp.ECDSAPrivateKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid raw. Cannot be nil.")
+
+	_, err = ki.KeyImport([]byte(nil), &bccsp.ECDSAPrivateKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[ECDSADERPrivateKeyImportOpts] Invalid raw. It must not be nil.")
+
+	_, err = ki.KeyImport([]byte{0}, &bccsp.ECDSAPrivateKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed converting PKIX to ECDSA public key")
+
+	k, err := rsa.GenerateKey(rand.Reader, 512)
+	assert.NoError(t, err)
+	raw := x509.MarshalPKCS1PrivateKey(k)
+	_, err = ki.KeyImport(raw, &bccsp.ECDSAPrivateKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed casting to ECDSA public key. Invalid raw material.")
+}
+
+func TestECDSAGoPublicKeyImportOptsKeyImporter(t *testing.T) {
+	ki := currentBCCSP
+
+	_, err := ki.KeyImport("Hello World", &bccsp.ECDSAGoPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[ECDSAGoPublicKeyImportOpts] Invalid raw material. Expected *ecdsa.PublicKey.")
+
+	_, err = ki.KeyImport(nil, &bccsp.ECDSAGoPublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid raw. Cannot be nil.")
+}
+
+func TestX509PublicKeyImportOptsKeyImporter(t *testing.T) {
+	ki := currentBCCSP
+
+	_, err := ki.KeyImport("Hello World", &bccsp.X509PublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "[X509PublicKeyImportOpts] Invalid raw material. Expected *x509.Certificate.")
+
+	_, err = ki.KeyImport(nil, &bccsp.X509PublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Invalid raw. Cannot be nil.")
+
+	cert := &x509.Certificate{}
+	cert.PublicKey = "Hello world"
+	_, err = ki.KeyImport(cert, &bccsp.X509PublicKeyImportOpts{})
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Certificate's public key type not recognized. Supported keys: [ECDSA, RSA]")
+}