Sync with our smtpd repo:

* first bricks of ldap and sqlite support (not finished but both working)
* new table API to replace map API, all lookups are done through tables
* improved handling of temporary errors throughout the daemon
* improved scheduler and mta logic: connection reuse, optimizes batches
* improved queue: more tolerant to admin errors, new layout, less disk-IO
* improved memory usage under high load
* SSL certs/keys isolated to lookup process to avoid facing network
* VIRTUAL support improved, fully virtual setups possible now
* runtime tracing of processes through smtpctl trace
* ssl_privsep.c sync-ed with relayd
* ssl.c no longer contains smtpd specific interfaces
* smtpd-specific ssl bits moved to ssl_smtpd.c
* update mail address in copyright

FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE. FLUSH YOUR QUEUE.

smtpd.conf(5) simplified, it will require adaptations

ok eric@

1 files changed, 118 insertions, 0 deletions

diff --git a/usr.sbin/smtpd/ssl_smtpd.c b/usr.sbin/smtpd/ssl_smtpd.c
new file mode 100644
index 00000000000..e1cea87eee1
--- /dev/null
+++ b/usr.sbin/smtpd/ssl_smtpd.c
@@ -0,0 +1,118 @@
+/*	$OpenBSD: ssl_smtpd.c,v 1.1 2013/01/26 09:37:24 gilles Exp $	*/
+
+/*
+ * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
+ * Copyright (c) 2008 Reyk Floeter <reyk@openbsd.org>
+ * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/tree.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+
+#include <ctype.h>
+#include <event.h>
+#include <fcntl.h>
+#include <imsg.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <openssl/ssl.h>
+#include <openssl/engine.h>
+#include <openssl/err.h>
+
+#include "smtpd.h"
+#include "log.h"
+#include "ssl.h"
+
+
+void *
+ssl_mta_init(char *cert, off_t cert_len, char *key, off_t key_len)
+{
+	SSL_CTX		*ctx;
+	SSL		*ssl = NULL;
+
+	ctx = ssl_ctx_create();
+
+	if (cert != NULL && key != NULL) {
+		if (!ssl_ctx_use_certificate_chain(ctx, cert, cert_len)) 
+			goto err;
+		else if (!ssl_ctx_use_private_key(ctx, key, key_len))
+			goto err;
+		else if (!SSL_CTX_check_private_key(ctx))
+			goto err;
+	}
+
+	if ((ssl = SSL_new(ctx)) == NULL)
+		goto err;
+	if (!SSL_set_ssl_method(ssl, SSLv23_client_method()))
+		goto err;
+
+	return (void *)(ssl);
+
+err:
+	if (ssl != NULL)
+		SSL_free(ssl);
+	ssl_error("ssl_mta_init");
+	return (NULL);
+}
+
+/* dummy_verify */
+static int
+dummy_verify(int ok, X509_STORE_CTX *store)
+{
+	/*
+	 * We *want* SMTP to request an optional client certificate, however we don't want the
+	 * verification to take place in the SMTP process. This dummy verify will allow us to
+	 * asynchronously verify in the lookup process.
+	 */
+	return 1;
+}
+
+void *
+ssl_smtp_init(void *ssl_ctx, char *cert, off_t cert_len, char *key, off_t key_len)
+{
+	SSL *ssl = NULL;
+
+	log_debug("debug: session_start_ssl: switching to SSL");
+
+	if (!ssl_ctx_use_certificate_chain(ssl_ctx, cert, cert_len))
+		goto err;
+	else if (!ssl_ctx_use_private_key(ssl_ctx, key, key_len))
+		goto err;
+	else if (!SSL_CTX_check_private_key(ssl_ctx))
+		goto err;
+
+	SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, dummy_verify);
+
+	if ((ssl = SSL_new(ssl_ctx)) == NULL)
+		goto err;
+	if (!SSL_set_ssl_method(ssl, SSLv23_server_method()))
+		goto err;
+
+	return (void *)(ssl);
+
+err:
+	if (ssl != NULL)
+		SSL_free(ssl);
+	ssl_error("ssl_smtp_init");
+	return (NULL);
+}