summaryrefslogtreecommitdiffstats
path: root/src/tls.c
diff options
context:
space:
mode:
authorgshapiro <gshapiro@FreeBSD.org>2011-06-14 03:55:17 +0000
committergshapiro <gshapiro@FreeBSD.org>2011-06-14 03:55:17 +0000
commitdd85ece875ddc33130bf7526bae9ff3c1eaf76e7 (patch)
tree3da31162aa07f4cb18ea5da754f721c4e84a21c5 /src/tls.c
parenta8454492fdd0eb5a005ff8ef52fad69f43baffe2 (diff)
downloadFreeBSD-src-dd85ece875ddc33130bf7526bae9ff3c1eaf76e7.zip
FreeBSD-src-dd85ece875ddc33130bf7526bae9ff3c1eaf76e7.tar.gz
Import sendmail 8.14.5
Diffstat (limited to 'src/tls.c')
-rw-r--r--src/tls.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tls.c b/src/tls.c
index 7031994..a57a05d 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2006, 2008, 2009 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2006, 2008, 2009, 2011 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
#include <sendmail.h>
-SM_RCSID("@(#)$Id: tls.c,v 8.114 2009/08/10 15:11:09 ca Exp $")
+SM_RCSID("@(#)$Id: tls.c,v 8.118 2011/03/07 23:20:47 ca Exp $")
#if STARTTLS
# include <openssl/err.h>
@@ -1168,7 +1168,7 @@ tls_get_info(ssl, srv, host, mac, certreq)
MACROS_T *mac;
bool certreq;
{
- SSL_CIPHER *c;
+ const SSL_CIPHER *c;
int b, r;
long verifyok;
char *s, *who;
@@ -1213,12 +1213,14 @@ tls_get_info(ssl, srv, host, mac, certreq)
macdefine(mac, A_TEMP, macid("{cert_issuer}"),
xtextify(buf, "<>\")"));
+# define LL_BADCERT 8
+
#define CHECK_X509_NAME(which) \
do { \
if (r == -1) \
{ \
sm_strlcpy(buf, "BadCertificateUnknown", sizeof(buf)); \
- if (LogLevel > 7) \
+ if (LogLevel > LL_BADCERT) \
sm_syslog(LOG_INFO, NOQID, \
"STARTTLS=%s, relay=%.100s, field=%s, status=failed to extract CN", \
who, \
OpenPOWER on IntegriCloud