[FAB-4177] BCCSP PKCS11 DER encoding for CKA_EC_POINT

Change request to address [FAB-4177] so that CKA_EC_POINT
is always DER encoded when importing EC public keys with
the BCCSP PKCS11 implementation.

Change-Id: I3309c5c31722f7187f38bd2dbadaa7a5932e2ae2
Signed-off-by: Jonathan Patchell <[email protected]>

Author: Jonathan Patchell

bccsp/pkcs11/pkcs11.go

@@ -23,7 +23,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"math/big"
-	"strings"
 	"sync"
 
 	"github.com/miekg/pkcs11"
@@ -392,10 +391,8 @@ func (csp *impl) importECKey(curve asn1.ObjectIdentifier, privKey, ecPt []byte,
 		hash := sha256.Sum256(ecPt)
 		ski = hash[:]
 
-		if strings.Contains(csp.lib, "softhsm") {
-			// Probably SoftHSM, some handcrafting necessary
-			ecPt = append([]byte{0x04, byte(len(ecPt))}, ecPt...)
-		}
+		// Add DER encoding for the CKA_EC_POINT
+		ecPt = append([]byte{0x04, byte(len(ecPt))}, ecPt...)
 
 		keyTemplate = []*pkcs11.Attribute{
 			pkcs11.NewAttribute(pkcs11.CKA_KEY_TYPE, pkcs11.CKK_EC),