From owner-svn-ports-head@freebsd.org  Sun Jun 12 17:17:03 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D51AAF1D75;
 Sun, 12 Jun 2016 17:17:03 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D3B5E2B2D;
 Sun, 12 Jun 2016 17:17:02 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5CHH2gU070187;
 Sun, 12 Jun 2016 17:17:02 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5CHH2OB070185;
 Sun, 12 Jun 2016 17:17:02 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201606121717.u5CHH2OB070185@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 12 Jun 2016 17:17:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r416810 - head/ftp/pavuk/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jun 2016 17:17:03 -0000

Author: brnrd
Date: Sun Jun 12 17:17:01 2016
New Revision: 416810
URL: https://svnweb.freebsd.org/changeset/ports/416810

Log:
  ftp/pavuk: Fix build with OpenSSL 1.1 / LibreSSL
  
    - Replace deprecated des_ methods with their DES_ equivalents
  
  PR:		198333
  Sponsored by:	BSDCan 2016

Added:
  head/ftp/pavuk/files/patch-src__ntlm_auth.c   (contents, props changed)

Added: head/ftp/pavuk/files/patch-src__ntlm_auth.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/pavuk/files/patch-src__ntlm_auth.c	Sun Jun 12 17:17:01 2016	(r416810)
@@ -0,0 +1,35 @@
+--- src/ntlm_auth.c.orig	2005-10-27 16:06:37.000000000 +0200
++++ src/ntlm_auth.c	2015-02-28 12:38:57.150120721 +0100
+@@ -249,14 +249,14 @@
+ static void ntlm_des_enc(unsigned char *key, unsigned char *plaintext,
+   unsigned char *result)
+ {
+-  des_key_schedule ks;
++  DES_key_schedule ks;
+ #ifdef OPENSSL
+-  const_des_cblock _plaintext;
++  const_DES_cblock _plaintext;
+ #else
+   const des_cblock _plaintext;
+ #endif
+-  des_cblock _result;
+-  des_cblock key64;
++  DES_cblock _result;
++  DES_cblock key64;
+   unsigned char skey[8];
+ 
+   memcpy(&_plaintext, plaintext, sizeof(_plaintext));
+@@ -265,10 +265,10 @@
+   memcpy(key64, skey, 8);
+ 
+ #ifdef OPENSSL
+-  des_set_odd_parity(&key64);
+-  des_set_key(&key64, ks);
++  DES_set_odd_parity(&key64);
++  DES_set_key(&key64, &ks);
+ 
+-  des_ecb_encrypt(&_plaintext, &_result, ks, DES_ENCRYPT);
++  DES_ecb_encrypt(&_plaintext, &_result, &ks, DES_ENCRYPT);
+ #else
+   des_set_odd_parity(key64);
+   des_set_key(key64, ks);