{
smtp_transport_options_block * ob = v_ob;
static uschar txt[256];
-uschar *expciphers;
-X509* server_cert;
+uschar * expciphers;
+X509 * server_cert;
int rc;
static uschar cipherbuf[256];
#ifndef DISABLE_OCSP
-BOOL require_ocsp = FALSE;
BOOL request_ocsp = FALSE;
+BOOL require_ocsp = FALSE;
#endif
#ifdef EXPERIMENTAL_DANE
-BOOL dane_in_use;
+dns_answer tlsa_dnsa;
+BOOL dane = FALSE;
+BOOL dane_required;
#endif
#ifdef EXPERIMENTAL_DANE
-/*XXX TBD: test for transport options, and for TLSA records */
-dane_in_use = FALSE;
+dane_required = verify_check_this_host(&ob->hosts_require_dane, NULL,
+ host->name, host->address, NULL) == OK;
+
+if (host->dnssec == DS_YES)
+ {
+ if( dane_required
+ || verify_check_this_host(&ob->hosts_try_dane, NULL,
+ host->name, host->address, NULL) == OK
+ )
+ {
+ /* move this out to host.c given the similarity to dns_lookup() ? */
+ uschar buffer[300];
+ uschar * fullname = buffer;
+
+ /* TLSA lookup string */
+ (void)sprintf(CS buffer, "_%d._tcp.%.256s", host->port,
+ host->name);
+
+ switch (rc = dns_lookup(&tlsa_dnsa, buffer, T_TLSA, &fullname))
+ {
+ case DNS_AGAIN:
+ return DEFER; /* just defer this TLS'd conn */
-if (!dane_in_use)
+ default:
+ case DNS_FAIL:
+ if (dane_required)
+ {
+ log_write(0, LOG_MAIN, "DANE error: TLSA lookup failed");
+ return FAIL;
+ }
+ break;
+
+ case DNS_SUCCEED:
+ if (!dns_is_secure(&tlsa_dnsa))
+ {
+ log_write(0, LOG_MAIN, "DANE error: TLSA lookup not DNSSEC");
+ return DEFER;
+ }
+ dane = TRUE;
+ break;
+ }
+ }
+ }
+else if (dane_required)
+ {
+ /* Hmm - what lookup, precisely? */
+ log_write(0, LOG_MAIN, "DANE error: previous lookup not DNSSEC");
+ return FAIL;
+ }
+
+if (!dane) /*XXX todo: enable ocsp with dane */
#endif
#ifndef DISABLE_OCSP
}
#ifdef EXPERIMENTAL_DANE
-if (dane_in_use)
+if (dane)
{
if (!DANESSL_library_init())
return tls_error(US"library init", host, US"DANE library error");
#endif
#ifdef EXPERIMENTAL_DANE
-if (dane_in_use)
+if (dane)
{
- if (DANESSL_init(client_ssl, NULL, NULL /*??? hostnames*/) != 1)
+ dns_record * rr;
+ dns_scan dnss;
+ uschar * hostnames[2] = { host->name, NULL };
+
+ if (DANESSL_init(client_ssl, NULL, hostnames) != 1)
return tls_error(US"hostnames load", host, US"DANE library error");
- /*
- foreach TLSA record
-
- DANESSL_add_tlsa(client_ssl, uint8_t usage, uint8_t selector,
- const char *mdname,
- unsigned const char *data, size_t dlen)
- */
+ for (rr = dns_next_rr(&tlsa_dnsa, &dnss, RESET_ANSWERS);
+ rr;
+ rr = dns_next_rr(&tlsa_dnsa, &dnss, RESET_NEXT)
+ ) if (rr->type == T_TLSA)
+ {
+ uschar * p = rr->data;
+ int usage, selector, mtype;
+ const char * mdname;
+
+ GETSHORT(usage, p);
+ GETSHORT(selector, p);
+ GETSHORT(mtype, p);
+
+ switch (mtype)
+ {
+ default: /* log bad */ return FAIL;
+ case 0: mdname = NULL; break;
+ case 1: mdname = "SHA2-256"; break;
+ case 2: mdname = "SHA2-512"; break;
+ }
+
+ switch (DANESSL_add_tlsa(client_ssl,
+ (uint8_t) usage, (uint8_t) selector,
+ mdname, p, rr->size - (p - rr->data)))
+ {
+ default:
+ case 0: /* action not taken; log error */
+ return FAIL;
+ case 1: break;
+ }
+ }
}
#endif
alarm(0);
#ifdef EXPERIMENTAL_DANE
-DANESSL_cleanup(client_ssl); /*XXX earliest possible callpoint. Too early? */
+if (dane)
+ DANESSL_cleanup(client_ssl); /*XXX earliest possible callpoint. Too early? */
#endif
if (rc <= 0)