Enable chaincode to work without TLS as well

1. Root certificate is an optional parameter supplied for
chaincode to verify the peer's connection in response.
2. If TLS is enabled, then specify the key and cert
parameters. Do not expect it otherwise.

Signed-off-by: S m, Aruna <arun.s.m.cse@gmail.com>
This commit is contained in:
S m, Aruna 2021-04-18 14:31:40 +05:30
parent f9d458e9ae
commit f6a06340fc
No known key found for this signature in database
GPG key ID: 0E27DEADAA8A3DD4

View file

@ -243,19 +243,27 @@ func getTLSProperties() shim.TLSProperties {
// convert tlsDisabledStr to boolean // convert tlsDisabledStr to boolean
tlsDisabled := getBoolOrDefault(tlsDisabledStr, false) tlsDisabled := getBoolOrDefault(tlsDisabledStr, false)
var keyBytes, certBytes, clientCACertBytes []byte
var err error
keyBytes, err := ioutil.ReadFile(key) if !tlsDisabled {
if err != nil { keyBytes, err = ioutil.ReadFile(key)
log.Panicf("error while reading the crypto file: %s", err) if err != nil {
log.Panicf("error while reading the crypto file: %s", err)
}
certBytes, err = ioutil.ReadFile(cert)
if err != nil {
log.Panicf("error while reading the crypto file: %s", err)
}
} }
certBytes, err := ioutil.ReadFile(cert) // Did not request for the peer cert verification
if err != nil { if clientCACert != "" {
log.Panicf("error while reading the crypto file: %s", err) clientCACertBytes, err = ioutil.ReadFile(clientCACert)
} if err != nil {
clientCACertBytes, err := ioutil.ReadFile(clientCACert) log.Panicf("error while reading the crypto file: %s", err)
if err != nil { }
log.Panicf("error while reading the crypto file: %s", err)
} }
return shim.TLSProperties{ return shim.TLSProperties{
Disabled: tlsDisabled, Disabled: tlsDisabled,
Key: keyBytes, Key: keyBytes,