Merge branch 'feature/newConsensus' of gitlab.peersafe.cn:chainsql/chainsqld into feature/newConsensus

Author: luleigreat

src/peersafe/crypto/impl/X509.cpp

@@ -22,6 +22,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <fstream>
 #include <sstream>   
 
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
@@ -110,7 +111,11 @@ namespace ripple {
 			ret = X509_STORE_add_cert(certChain, certChainStr);
 			if (1 != ret) {
 
-				exception = "X509_STORE_add_cert fail, ret = " + ret;
+				auto errID = ::ERR_get_error();
+				char buf[256];
+				::ERR_error_string_n(errID, buf, sizeof(buf));
+				::ERR_clear_error();
+				exception = (boost::format("X509_STORE_add_cert err_msg: %s , err_code:  %ld") % buf % errID).str();
 				goto EXIT;
 			}
 		}

src/ripple/core/impl/Config.cpp

@@ -309,6 +309,7 @@ void Config::loadFromString (std::string const& fileContents)
 	if (auto s = getIniFileSection(secConfig, SECTION_PATH_X509)) {
 
 		auto const vecCrtPath = *s;
+		std::set<std::string> setRootCert;
 		for (auto path : vecCrtPath) {
 
 			std::string rootCert;
@@ -317,9 +318,10 @@ void Config::loadFromString (std::string const& fileContents)
 				std::istreambuf_iterator<char>(ifsPath),
 				std::istreambuf_iterator<char>());
 
-			if (rootCert.empty())
+			if (rootCert.empty() || setRootCert.count(rootCert) !=0 )
 				continue;
 
+			setRootCert.insert(rootCert);
 			ROOT_CERTIFICATES.push_back(rootCert);
 		}