git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6a8a60e
)
Certificate-related routines only present when TLS is supported
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 8 May 2014 22:29:35 +0000
(23:29 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 8 May 2014 22:29:35 +0000
(23:29 +0100)
src/src/expand.c
patch
|
blob
|
history
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 9532d9d3364f2987e9bfaf6ce816932307138df3..01c6e05f41105ce2f8880af2fde8ee758d2ae41e 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-5747,6
+5747,7
@@
while (*s != 0)
as we do not want to do the usual expansion. For most, expand the string.*/
switch(c)
{
as we do not want to do the usual expansion. For most, expand the string.*/
switch(c)
{
+#ifdef SUPPORT_TLS
case EOP_SHA1:
case EOP_MD5:
if (s[1] == '$')
case EOP_SHA1:
case EOP_MD5:
if (s[1] == '$')
@@
-5764,6
+5765,7
@@
while (*s != 0)
}
vp = NULL;
/*FALLTHROUGH*/
}
vp = NULL;
/*FALLTHROUGH*/
+#endif
default:
sub = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok);
if (!sub) goto EXPAND_FAILED;
default:
sub = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok);
if (!sub) goto EXPAND_FAILED;
@@
-5855,12
+5857,14
@@
while (*s != 0)
}
case EOP_MD5:
}
case EOP_MD5:
+#ifdef SUPPORT_TLS
if (vp && *(void **)vp->value)
{
uschar * cp = tls_cert_fprt_md5(*(void **)vp->value);
yield = string_cat(yield, &size, &ptr, cp, (int)strlen(cp));
}
else
if (vp && *(void **)vp->value)
{
uschar * cp = tls_cert_fprt_md5(*(void **)vp->value);
yield = string_cat(yield, &size, &ptr, cp, (int)strlen(cp));
}
else
+#endif
{
md5 base;
uschar digest[16];
{
md5 base;
uschar digest[16];
@@
-5874,12
+5878,14
@@
while (*s != 0)
continue;
case EOP_SHA1:
continue;
case EOP_SHA1:
+#ifdef SUPPORT_TLS
if (vp && *(void **)vp->value)
{
uschar * cp = tls_cert_fprt_sha1(*(void **)vp->value);
yield = string_cat(yield, &size, &ptr, cp, (int)strlen(cp));
}
else
if (vp && *(void **)vp->value)
{
uschar * cp = tls_cert_fprt_sha1(*(void **)vp->value);
yield = string_cat(yield, &size, &ptr, cp, (int)strlen(cp));
}
else
+#endif
{
sha1 base;
uschar digest[20];
{
sha1 base;
uschar digest[20];