[exim-cvs] Certificate-related routines only present when TL…

Top Page
Delete this message
Reply to this message
Author: Exim Git Commits Mailing List
Date:  
To: exim-cvs
Subject: [exim-cvs] Certificate-related routines only present when TLS is supported
Gitweb: http://git.exim.org/exim.git/commitdiff/80c974f8633781c6f10a196ed33e6cdce605bcd4
Commit:     80c974f8633781c6f10a196ed33e6cdce605bcd4
Parent:     6a8a60e0f273b61a24a48afd3217ff84106779bd
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu May 8 23:29:35 2014 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu May 8 23:29:35 2014 +0100


    Certificate-related routines only present when TLS is supported
---
 src/src/expand.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


diff --git a/src/src/expand.c b/src/src/expand.c
index 9532d9d..01c6e05 100644
--- 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)
       {
+#ifdef SUPPORT_TLS
       case EOP_SHA1:
       case EOP_MD5:
     if (s[1] == '$')
@@ -5764,6 +5765,7 @@ while (*s != 0)
       }
     vp = NULL;
         /*FALLTHROUGH*/
+#endif
       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:
+#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
+#endif
       {
       md5 base;
       uschar digest[16];
@@ -5874,12 +5878,14 @@ while (*s != 0)
         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
+#endif
       {
       sha1 base;
       uschar digest[20];