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 wrap: on
line diff
--- a/src/smtp_out.c	Wed Sep 14 11:50:45 2011 +0200
+++ b/src/smtp_out.c	Wed Sep 14 12:07:34 2011 +0200
@@ -31,16 +31,8 @@
 #include "readsock.h"
 
 #ifdef ENABLE_AUTH
-
-#ifdef USE_LIB_CRYPTO
-#include <openssl/hmac.h>
-#include <openssl/md5.h>
-#include <openssl/evp.h>
-#else
 #include "md5/md5.h"
 #include "md5/hmac_md5.h"
-#endif
-
 #include "base64/base64.h"
 #endif
 
@@ -567,21 +559,13 @@
 			guchar digest[16], *reply64, *reply;
 			gchar digest_string[33];
 			gint i;
-#ifdef USE_LIB_CRYPTO
-			unsigned int digest_len;
-#endif
 
 			DEBUG(5) debugf("smtp_out_auth_cram_md5():\n");
 			DEBUG(5) debugf("  encoded challenge = %s\n", chall64);
 			DEBUG(5) debugf("  decoded challenge = %s, size = %d\n", chall, chall_size);
 			DEBUG(5) debugf("  secret = %s\n", psb->auth_secret);
 
-#ifdef USE_LIB_CRYPTO
-			HMAC(EVP_md5(), psb->auth_secret, strlen(psb->auth_secret), chall, chall_size, digest, &digest_len);
-#else
 			hmac_md5(chall, chall_size, psb->auth_secret, strlen(psb->auth_secret), digest);
-#endif
-
 			for (i = 0; i < 16; i++)
 				sprintf(&(digest_string[i + i]), "%02x", (unsigned int) (digest[i]));
 			digest_string[32] = '\0';