Merge pull request #267 from C0rWin/fixTls

mbwhite · web-flow · commit f96749b3cde0 · 2022-12-14T16:43:50.000Z
Fix TLS setup for chaincode server
diff --git a/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java b/fabric-chaincode-shim/src/main/java/org/hyperledger/fabric/shim/ChaincodeBase.java
@@ -539,7 +539,7 @@ public final ChaincodeServerProperties getChaincodeServerConfig() throws URISynt
 
             // set values on the server properties
             chaincodeServerProperties.setTlsEnabled(true);
-            chaincodeServerProperties.setKeyFile(this.tlsClientCertFile);
+            chaincodeServerProperties.setKeyFile(this.tlsClientKeyFile);
             chaincodeServerProperties.setKeyCertChainFile(this.tlsClientCertFile);
         }
         return chaincodeServerProperties;

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ public final ChaincodeServerProperties getChaincodeServerConfig() throws URISynt`
`539`	`539`
`540`	`540`	`// set values on the server properties`
`541`	`541`	`chaincodeServerProperties.setTlsEnabled(true);`
`542`		`- chaincodeServerProperties.setKeyFile(this.tlsClientCertFile);`
	`542`	`+ chaincodeServerProperties.setKeyFile(this.tlsClientKeyFile);`
`543`	`543`	`chaincodeServerProperties.setKeyCertChainFile(this.tlsClientCertFile);`
`544`	`544`	`}`
`545`	`545`	`return chaincodeServerProperties;`