FABN-1331

fix functions in bccsp_pkcs11.js to check input parameter opts and set default for algorithm before using them:
createKeyFromRaw
generateEphemeralKey

Signed-off-by: huxd <huxd@cn.ibm.com>
Change-Id: I9632ff33ba005c50c171e8001440e643e636684e

Author: huxd

fabric-common/lib/impl/bccsp_pkcs11.js

@@ -800,6 +800,9 @@ class CryptoSuite_PKCS11 extends CryptoSuite {
 	 * containing the private key and the public key.
 	 */
 	generateEphemeralKey(opts) {
+		if (!opts) {
+			opts = {};
+		}
 		if (opts !== null && (typeof opts.algorithm === 'undefined' || opts.algorithm === null)) {
 			opts.algorithm = 'ECDSA';
 		}
@@ -1024,6 +1027,9 @@ class CryptoSuite_PKCS11 extends CryptoSuite {
 	createKeyFromRaw(pem, opts) {
 		const optsLocal = opts ? opts : {};
 		const token = !optsLocal.ephemeral;
+		if (optsLocal !== null && (typeof optsLocal.algorithm === 'undefined' || optsLocal.algorithm === null)) {
+			optsLocal.algorithm = 'X509Certificate';
+		}
 		switch (optsLocal.algorithm.toUpperCase()) {
 			case 'X509CERTIFICATE':
 				return new ECDSAKey(KEYUTIL.getKey(pem));