libtransport.git Changeset - 92d7e4d689ba

Changeset - 92d7e4d689ba

Parent rev.

Child rev.

[Not reviewed]

Merge

0 4 0

vitalyster - 9 years ago 2016-04-27 13:31:31
vitalyster@gmail.com

Merge pull request #122 from lxp/master

Libpurple: Add service.verify_certs option to enable certificate verification

1 file changed with 11 insertions and 1 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 static void *requestAction(const char *title, const char *primary, const char *secondary, int default_action, PurpleAccount *account, const char *who,PurpleConversation *conv, void *user_data, size_t action_count, va_list actions){
 	std::string t(title ? title : "NULL");
 	if (t == "SSL Certificate Verification") {
 		LOG4CXX_INFO(logger,  "accepting SSL certificate");
 		if (CONFIG_BOOL_DEFAULTED(config, "service.verify_certs", false)) {
 			LOG4CXX_INFO(logger,  "rejecting SSL certificate");
 			va_arg(actions, char *);
 			va_arg(actions, GCallback);
 		} else {
 			LOG4CXX_INFO(logger,  "accepting SSL certificate");
+		}
 		va_arg(actions, char *);
 		((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+	}
 			std::string headerString(title);
 			LOG4CXX_INFO(logger,  "header string: " << headerString);
 			if (headerString == "SSL Certificate Verification") {
 				if (CONFIG_BOOL_DEFAULTED(config, "service.verify_certs", false)) {
 					va_arg(actions, char *);
 					va_arg(actions, GCallback);
+				}
 				va_arg(actions, char *);
 				((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+			}

0 comments (0 inline, 0 general)