diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/OS/Makefile-Base | 9 | ||||
| -rw-r--r-- | src/src/macro_predef.c | 2 | ||||
| -rw-r--r-- | src/src/macro_predef.h | 1 | ||||
| -rw-r--r-- | src/src/pdkim/crypt_ver.h | 2 | ||||
| -rw-r--r-- | src/src/pdkim/signing.c | 24 | ||||
| -rw-r--r-- | src/src/sha_ver.h | 2 | ||||
| -rw-r--r-- | src/src/tls-openssl.c | 4 |
7 files changed, 33 insertions, 11 deletions
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index c96f46f0e..11ba19e61 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -134,8 +134,8 @@ OBJ_MACRO = macro_predef.o \ macro-smtp.o macro-accept.o macro-dnslookup.o macro-ipliteral.o macro-iplookup.o \ macro-manualroute.o macro-queryprogram.o macro-redirect.o \ macro-auth-spa.o macro-cram_md5.o macro-cyrus_sasl.o macro-dovecot.o macro-gsasl_exim.o \ - macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-tls.o\ - macro-dkim.o macro-malware.o macro-macro.o macro-tree.o + macro-heimdal_gssapi.o macro-plaintext.o macro-spa.o macro-authtls.o \ + macro-dkim.o macro-malware.o macro-macro.o macro-tree.o macro-signing.o $(OBJ_MACRO): $(MACRO_HSRC) @@ -220,7 +220,7 @@ macro-plaintext.o : auths/plaintext.c macro-spa.o : auths/spa.c @echo "$(CC) -DMACRO_PREDEF auths/spa.c" $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/spa.c -macro-tls.o: auths/tls.c +macro-authtls.o: auths/tls.c @echo "$(CC) -DMACRO_PREDEF auths/tls.c" $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ auths/tls.c macro-dkim.o: dkim.c @@ -235,6 +235,9 @@ macro-macro.o: macro.c macro-tree.o: tree.c @echo "$(CC) -DMACRO_PREDEF tree.c" $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ tree.c +macro-signing.o: pdkim/signing.c + @echo "$(CC) -DMACRO_PREDEF pdkim/signing.c" + $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ pdkim/signing.c macro_predef: $(OBJ_MACRO) @echo "$(LNCC) -o $@" diff --git a/src/src/macro_predef.c b/src/src/macro_predef.c index b594d5bfd..2485072f4 100644 --- a/src/src/macro_predef.c +++ b/src/src/macro_predef.c @@ -258,6 +258,8 @@ due to conflicts with other common macros. */ #ifdef WITH_CONTENT_SCAN features_malware(); #endif + +features_crypto(); } diff --git a/src/src/macro_predef.h b/src/src/macro_predef.h index bfa201068..50b61a897 100644 --- a/src/src/macro_predef.h +++ b/src/src/macro_predef.h @@ -13,6 +13,7 @@ extern void builtin_macro_create_var(const uschar *, const uschar *); extern void options_from_list(optionlist *, unsigned, const uschar *, uschar *); extern void features_malware(void); +extern void features_crypto(void); extern void options_main(void); extern void options_routers(void); extern void options_transports(void); diff --git a/src/src/pdkim/crypt_ver.h b/src/src/pdkim/crypt_ver.h index 7b0ddf92a..ad7db025e 100644 --- a/src/src/pdkim/crypt_ver.h +++ b/src/src/pdkim/crypt_ver.h @@ -17,7 +17,7 @@ # if GNUTLS_VERSION_NUMBER >= 0x030000 # define SIGN_GNUTLS # if GNUTLS_VERSION_NUMBER >= 0x030600 -# define SIGN_HAVE_ED25519 +# define SIGN_HAVE_ED25519 /*MMMM*/ # endif # else # define SIGN_GCRYPT diff --git a/src/src/pdkim/signing.c b/src/src/pdkim/signing.c index f73fa9cc8..b61b42832 100644 --- a/src/src/pdkim/signing.c +++ b/src/src/pdkim/signing.c @@ -7,16 +7,31 @@ */ #include "../exim.h" +#include "crypt_ver.h" +#include "signing.h" + + +#ifdef MACRO_PREDEF +# include "../macro_predef.h" + +void +features_crypto(void) +{ +# ifdef SIGN_HAVE_ED25519 + builtin_macro_create(US"_CRYPTO_SIGN_ED25519"); +# endif +# ifdef EXIM_HAVE_SHA3 + builtin_macro_create(US"_CRYPTO_HASH_SHA3"); +# endif +} +#else -#ifndef DISABLE_DKIM /* entire file */ +#ifndef DISABLE_DKIM /* rest of file */ #ifndef SUPPORT_TLS # error Need SUPPORT_TLS for DKIM #endif -#include "crypt_ver.h" -#include "signing.h" - /******************************************************************************/ #ifdef SIGN_GNUTLS @@ -884,4 +899,5 @@ switch (hash) /******************************************************************************/ #endif /*DISABLE_DKIM*/ +#endif /*MACRO_PREDEF*/ /* End of File */ diff --git a/src/src/sha_ver.h b/src/src/sha_ver.h index b86e9a831..61408788b 100644 --- a/src/src/sha_ver.h +++ b/src/src/sha_ver.h @@ -26,7 +26,7 @@ # if GNUTLS_VERSION_NUMBER >= 0x020a00 # define SHA_GNUTLS # if GNUTLS_VERSION_NUMBER >= 0x030500 -# define EXIM_HAVE_SHA3 +# define EXIM_HAVE_SHA3 /*MMMM*/ # endif # else # define SHA_GCRYPT diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index a542d4db0..00b5a7349 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -51,7 +51,7 @@ functions from the OpenSSL library. */ # define EXIM_HAVE_RAND_PSEUDO #endif #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_SHA256) -# define EXIM_HAVE_SHA256 +# define EXIM_HAVE_SHA256 /*MMMM*/ #endif /* @@ -81,7 +81,7 @@ functions from the OpenSSL library. */ || LIBRESSL_VERSION_NUMBER >= 0x20010000L # if !defined(OPENSSL_NO_ECDH) # if OPENSSL_VERSION_NUMBER >= 0x0090800fL -# define EXIM_HAVE_ECDH +# define EXIM_HAVE_ECDH /*MMMM*/ # endif # if OPENSSL_VERSION_NUMBER >= 0x10002000L # define EXIM_HAVE_OPENSSL_EC_NIST2NID |