diff options
author | John Marino <marino@FreeBSD.org> | 2016-09-11 22:53:06 +0000 |
---|---|---|
committer | John Marino <marino@FreeBSD.org> | 2016-09-11 22:53:06 +0000 |
commit | 9b84991e846505c453d2ab1aa20292aa6b1505cd (patch) | |
tree | 1383fc605e6e51e4c3186fead7e7856f89b9ab00 /mail/libesmtp | |
parent | 64c5fcbc8357b565a1cacde78ccee0c9cb37bff0 (diff) | |
download | ports-9b84991e846505c453d2ab1aa20292aa6b1505cd.tar.gz ports-9b84991e846505c453d2ab1aa20292aa6b1505cd.zip |
mail/libestmp: FIx build with LibreSSL (deprecated DES methods)
Notes
Notes:
svn path=/head/; revision=421882
Diffstat (limited to 'mail/libesmtp')
-rw-r--r-- | mail/libesmtp/Makefile | 2 | ||||
-rw-r--r-- | mail/libesmtp/files/patch-ntlm_ntlmdes.c | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index 2229264fd009..dd3aa5cb7f6c 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -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} diff --git a/mail/libesmtp/files/patch-ntlm_ntlmdes.c b/mail/libesmtp/files/patch-ntlm_ntlmdes.c new file mode 100644 index 000000000000..064ce30dff04 --- /dev/null +++ b/mail/libesmtp/files/patch-ntlm_ntlmdes.c @@ -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); + |