loudmouth: comparison loudmouth/lm-ssl-openssl.c

equal deleted inserted replaced

-:3697251ef911
+:f57b1b61e1fe
 __FILE__, server, cn);
 if (domain != NULL) {
 if ((cn[0] == '*') && (cn[1] == '.')) {
 /*
 * FWB: huh? ever tested?
 * server="sub.domain.tld";
 * cn="*.domain.tld";
 * domain=strstr(cn, server); ???
 */
 /* domain = strstr (cn, server); */
 server = strchr(server, '.') + 1;
 domain = cn + 2;
 }
 if (strncasecmp (server, domain, LM_SSL_CN_MAX) != 0) {
 /* FWB: CN doesn't match, try SANs */
 int subject_alt_names_nb = -1;
 int san_result = 0;
 int san_counter;
 STACK_OF(GENERAL_NAME) *subject_alt_names = NULL;
 /* g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SSL, "%s: CN does not match server name\n", __FILE__); */
 // Try to extract the names within the SAN extension from the certificate
 subject_alt_names = X509_get_ext_d2i((X509 *) srv_crt, NID_subject_alt_name, NULL, NULL);
 if (subject_alt_names != NULL) {
 // Check each name within the extension
 subject_alt_names_nb = sk_GENERAL_NAME_num(subject_alt_names);
 for (san_counter=0; san_counter<subject_alt_names_nb; san_counter++) {
 const GENERAL_NAME *current_name = sk_GENERAL_NAME_value(subject_alt_names, san_counter);
 if (current_name->type == GEN_DNS) {
 } else {
 g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SSL, "%s: found SAN '%s'\n", __FILE__, current_name->d.dNSName->data);
 }
 }
 }
 }
 sk_GENERAL_NAME_pop_free(subject_alt_names, GENERAL_NAME_free);
 if (!san_result) goto cn_and_san_mismatch;
 } /* SAN */
 } else {
 SSL_CTX_set_verify (ssl->ssl_ctx, SSL_VERIFY_PEER, ssl_verify_cb);
 }
 gboolean
 _lm_ssl_set_ca (LmSSL       *ssl,
-		const gchar *ca_path)
+const gchar *ca_path)
 {
 struct stat target;
 int success = 0;
 if (stat (ca_path, &target) != 0) {
 g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SSL,
-	       "ca_path '%s': no such file or directory", ca_path);
+"ca_path '%s': no such file or directory", ca_path);
 return FALSE;
 }
 if (S_ISDIR (target.st_mode)) {
 success = SSL_CTX_load_verify_locations(ssl->ssl_ctx, NULL, ca_path);
 } else if (S_ISREG (target.st_mode)) {
 success = SSL_CTX_load_verify_locations(ssl->ssl_ctx, ca_path, NULL);
 }
 if (success == 0) {
 g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_SSL,
-	       "Loading of ca_path '%s' failed: %s",
+"Loading of ca_path '%s' failed: %s",
-	       ca_path,
+ca_path,
-	       ERR_error_string(ERR_peek_last_error(), NULL));
+ERR_error_string(ERR_peek_last_error(), NULL));
 return FALSE;
 }
 return TRUE;
 }

changeset 664	f57b1b61e1fe
parent 661	22492003e3f7
child 682	4a092b834996