From owner-svn-ports-head@FreeBSD.ORG Tue Mar 3 15:41:58 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 15ABE487; Tue, 3 Mar 2015 15:41:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DAC3DD26; Tue, 3 Mar 2015 15:41:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t23FfvCp045356; Tue, 3 Mar 2015 15:41:57 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t23FfvMR045355; Tue, 3 Mar 2015 15:41:57 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201503031541.t23FfvMR045355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 3 Mar 2015 15:41:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380379 - head/net-mgmt/ettercap/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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2015 15:41:58 -0000 Author: sunpoet Date: Tue Mar 3 15:41:56 2015 New Revision: 380379 URL: https://svnweb.freebsd.org/changeset/ports/380379 QAT: https://qat.redports.org/buildarchive/r380379/ Log: - Replace deprecated des_* methods with DES_* ones PR: 198184 Submitted by: Bernard Spil Obtained from: https://github.com/Ettercap/ettercap/commit/f71cd222712d6ecec6f086f3b8acca981e25f819 Added: head/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c (contents, props changed) Added: head/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c Tue Mar 3 15:41:56 2015 (r380379) @@ -0,0 +1,46 @@ +Obtained from: https://github.com/Ettercap/ettercap/commit/f71cd222712d6ecec6f086f3b8acca981e25f819 + +--- src/dissectors/ec_ssh.c.orig 2014-10-17 01:29:44.000000000 +0800 ++++ src/dissectors/ec_ssh.c 2015-03-03 03:43:40.843089707 +0800 +@@ -87,8 +87,8 @@ + + struct des3_state + { +- des_key_schedule k1, k2, k3; +- des_cblock iv1, iv2, iv3; ++ DES_key_schedule k1, k2, k3; ++ DES_cblock iv1, iv2, iv3; + }; + + struct blowfish_state +@@ -608,13 +608,13 @@ + if (state == NULL) /* oops, couldn't allocate memory */ + return NULL; + +- des_set_key((void *)sesskey, (state->k1)); +- des_set_key((void *)(sesskey + 8), (state->k2)); ++ DES_set_key((void *)sesskey, &(state->k1)); ++ DES_set_key((void *)(sesskey + 8), &(state->k2)); + + if (len <= 16) +- des_set_key((void *)sesskey, (state->k3)); ++ DES_set_key((void *)sesskey, &(state->k3)); + else +- des_set_key((void *)(sesskey + 16), (state->k3)); ++ DES_set_key((void *)(sesskey + 16), &(state->k3)); + + memset(state->iv1, 0, 8); + memset(state->iv2, 0, 8); +@@ -630,9 +630,9 @@ + dstate = (struct des3_state *)state; + memcpy(dstate->iv1, dstate->iv2, 8); + +- des_ncbc_encrypt(src, dst, len, (dstate->k3), &dstate->iv3, DES_DECRYPT); +- des_ncbc_encrypt(dst, dst, len, (dstate->k2), &dstate->iv2, DES_ENCRYPT); +- des_ncbc_encrypt(dst, dst, len, (dstate->k1), &dstate->iv1, DES_DECRYPT); ++ DES_ncbc_encrypt(src, dst, len, &(dstate->k3), &dstate->iv3, DES_DECRYPT); ++ DES_ncbc_encrypt(dst, dst, len, &(dstate->k2), &dstate->iv2, DES_ENCRYPT); ++ DES_ncbc_encrypt(dst, dst, len, &(dstate->k1), &dstate->iv1, DES_DECRYPT); + } + + static void swap_bytes(const u_char *src, u_char *dst, int n)