fix admin certs for local fabric

IBM-Blockchain-Archive · Aug 18, 2017 · 574600b · 574600b
1 parent ab3992d
commit 574600b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/config/blockchain_creds_local.json b/config/blockchain_creds_local.json
@@ -37,13 +37,13 @@
 			],
 			"certificateAuthorities": [
 				"fabric-ca"
-			]
-		},
-		"adminPrivateKey": {
-			"path": "./crypto/privateKey.pem"
-		},
-		"signedCert": {
-			"path": "./crypto/signedCert.pem"
+			],
+			"adminPrivateKey": {
+				"path": "./crypto/prebaked/5890f0061619c06fb29dea8cb304edecc020fe63f41a6db109f1e227cc1cb2a8-priv"
+			},
+			"signedCert": {
+				"path": "./crypto/prebaked/PeerAdminCert.pem"
+			}
 		}
 	},
 	"orderers": {

diff --git a/config/crypto/prebaked/PeerAdminCert.pem b/config/crypto/prebaked/PeerAdminCert.pem
@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICGTCCAb+gAwIBAgIQKKKdQSzsDoUYn/LPAuRWGTAKBggqhkjOPQQDAjBzMQsw
+CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
+YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu
+b3JnMS5leGFtcGxlLmNvbTAeFw0xNzA2MjMxMjMzMTlaFw0yNzA2MjExMjMzMTla
+MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
+YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw
+EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAECmbzUDozIrLKjp3OAzItSG7m7Flw76rT
+8VO8E6otlCwxKtBRkPpZL7norC3NsjyE339J5O4pXCqhIApQyRRsRqNNMEswDgYD
+VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgDnKSJOiz8xeE
+yKk8W4729MHJHZ5uV3xFwzFjYJ/kABEwCgYIKoZIzj0EAwIDSAAwRQIhALT02pc/
+yfE/4wUJfUBQ32GifUEh8JktAXzL/73S0rjYAiACNSp6zAQBX9SBxTOGMk4cGGAy
+CKqf8052NVUs2CvPzA==
+-----END CERTIFICATE-----
diff --git a/dictionary_blockchain.txt b/dictionary_blockchain.txt
@@ -63,4 +63,5 @@ decodeb64
 cc's
 keepalive
 lscc
-rwset
+rwset
+priv
diff --git a/utils/helper.js b/utils/helper.js
@@ -285,7 +285,7 @@ module.exports = function (config_filename, logger) {
 	helper.getAdminPrivateKeyPEM = function (orgName) {
 		if (orgName && helper.creds.organizations && helper.creds.organizations[orgName]) {
 			if (!helper.creds.organizations[orgName].adminPrivateKey) {
-				throw new Error('Admin private key is not found in the creds json file');
+				throw new Error('Admin private key is not found in the creds json file: ' + orgName);
 			} else {
 				return loadPem(helper.creds.organizations[orgName].adminPrivateKey);
 			}
@@ -299,7 +299,7 @@ module.exports = function (config_filename, logger) {
 	helper.getAdminSignedCertPEM = function (orgName) {
 		if (orgName && helper.creds.organizations && helper.creds.organizations[orgName]) {
 			if (!helper.creds.organizations[orgName].signedCert) {
-				throw new Error('Admin certificate is not found in the creds json file');
+				throw new Error('Admin certificate is not found in the creds json file: ' + orgName);
 			} else {
 				return loadPem(helper.creds.organizations[orgName].signedCert);
 			}