summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2016-06-15 19:56:08 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2016-06-15 19:56:08 +0000
commit84e810a32bd26e230aa5a28359b291e059ae0676 (patch)
treef17f8b4506735b277d33c4fee6b2e74b1c7a2894
parent740afea1ba43876bb2284939caee0cbd437c2000 (diff)
'Received' header violates RFC when receiving a TLS session, rework format
reported by vstakhov
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 9962f1c78a0..2be0c0046e4 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.273 2016/06/08 06:52:56 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.274 2016/06/15 19:56:07 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1204,7 +1204,7 @@ smtp_filter_fd(uint64_t id, int fd)
if (s->flags & SF_SECURE) {
x = SSL_get_peer_certificate(s->io.ssl);
iobuf_fqueue(&s->obuf,
- "\n\tTLS version=%s cipher=%s bits=%d verify=%s",
+ " (%s:%s:%d:%s)",
SSL_get_version(s->io.ssl),
SSL_get_cipher_name(s->io.ssl),
SSL_get_cipher_bits(s->io.ssl, NULL),