masqmail
diff src/smtp_out.c @ 363:02bc0331e390
Removed support for openssl linking
It had been rarely used and could have caused legal problems.
For explanations, see this mail message:
Date: Sun, 04 Sep 2011 17:35:23 +0200
From: markus schnalke <meillo@marmaro.de>
To: masqmail@marmaro.de
Subject: [masqmail] RFC: Removal of configure options
Message-ID: <1R0EjD-4aX-00@serveme.home.schnalke.org>
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Wed, 14 Sep 2011 12:07:34 +0200 |
| parents | 412385b57dc4 |
| children | 41958685480d |
line diff
1.1 --- a/src/smtp_out.c Wed Sep 14 11:50:45 2011 +0200 1.2 +++ b/src/smtp_out.c Wed Sep 14 12:07:34 2011 +0200 1.3 @@ -31,16 +31,8 @@ 1.4 #include "readsock.h" 1.5 1.6 #ifdef ENABLE_AUTH 1.7 - 1.8 -#ifdef USE_LIB_CRYPTO 1.9 -#include <openssl/hmac.h> 1.10 -#include <openssl/md5.h> 1.11 -#include <openssl/evp.h> 1.12 -#else 1.13 #include "md5/md5.h" 1.14 #include "md5/hmac_md5.h" 1.15 -#endif 1.16 - 1.17 #include "base64/base64.h" 1.18 #endif 1.19 1.20 @@ -567,21 +559,13 @@ 1.21 guchar digest[16], *reply64, *reply; 1.22 gchar digest_string[33]; 1.23 gint i; 1.24 -#ifdef USE_LIB_CRYPTO 1.25 - unsigned int digest_len; 1.26 -#endif 1.27 1.28 DEBUG(5) debugf("smtp_out_auth_cram_md5():\n"); 1.29 DEBUG(5) debugf(" encoded challenge = %s\n", chall64); 1.30 DEBUG(5) debugf(" decoded challenge = %s, size = %d\n", chall, chall_size); 1.31 DEBUG(5) debugf(" secret = %s\n", psb->auth_secret); 1.32 1.33 -#ifdef USE_LIB_CRYPTO 1.34 - HMAC(EVP_md5(), psb->auth_secret, strlen(psb->auth_secret), chall, chall_size, digest, &digest_len); 1.35 -#else 1.36 hmac_md5(chall, chall_size, psb->auth_secret, strlen(psb->auth_secret), digest); 1.37 -#endif 1.38 - 1.39 for (i = 0; i < 16; i++) 1.40 sprintf(&(digest_string[i + i]), "%02x", (unsigned int) (digest[i])); 1.41 digest_string[32] = '\0';