Date: Sun, 11 Sep 2016 22:53:06 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421882 - in head/mail/libesmtp: . files Message-ID: <201609112253.u8BMr6e4015220@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Sep 11 22:53:06 2016 New Revision: 421882 URL: https://svnweb.freebsd.org/changeset/ports/421882 Log: mail/libestmp: FIx build with LibreSSL (deprecated DES methods) Added: head/mail/libesmtp/files/ head/mail/libesmtp/files/patch-ntlm_ntlmdes.c (contents, props changed) Modified: head/mail/libesmtp/Makefile Modified: head/mail/libesmtp/Makefile ============================================================================== --- head/mail/libesmtp/Makefile Sun Sep 11 22:39:11 2016 (r421881) +++ head/mail/libesmtp/Makefile Sun Sep 11 22:53:06 2016 (r421882) @@ -29,7 +29,7 @@ OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debug OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} -OPENSSL_USE= OPENSSL=yes +OPENSSL_USES= ssl post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Added: head/mail/libesmtp/files/patch-ntlm_ntlmdes.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/libesmtp/files/patch-ntlm_ntlmdes.c Sun Sep 11 22:53:06 2016 (r421882) @@ -0,0 +1,34 @@ +--- ntlm/ntlmdes.c.orig 2010-08-08 15:45:56 UTC ++++ ntlm/ntlmdes.c +@@ -30,10 +30,10 @@ + #include "ntlm.h" + + static void +-lm_deshash (void *result, const_des_cblock *iv, const void *secret) ++lm_deshash (void *result, const_DES_cblock *iv, const void *secret) + { +- des_cblock key; +- des_key_schedule ks; ++ DES_cblock key; ++ DES_key_schedule ks; + unsigned char key_56[8]; + size_t len; + +@@ -85,7 +85,7 @@ lm_uccpy (char *dst, size_t dstlen, cons + void + lm_hash_password (unsigned char *hash, const char *pass) + { +- static const_des_cblock iv = { 0x4B, 0x47, 0x53, 0x21, ++ static const_DES_cblock iv = { 0x4B, 0x47, 0x53, 0x21, + 0x40, 0x23, 0x24, 0x25 }; + char lmpass[14]; + +@@ -137,7 +137,7 @@ ntlm_responses (unsigned char *lm_resp, + const unsigned char *challenge, const char *secret) + { + unsigned char hash[21]; +- des_cblock nonce; ++ DES_cblock nonce; + + memcpy (&nonce, challenge, sizeof nonce); +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609112253.u8BMr6e4015220>