app-crypt/ophcrack: Fix issue 588902 (deprecated ssl functions).

This fixes the deprecation of the des_ functions in favour of
DES_ functions in openssl (and libressl which appears to have
done the deprecation early).  The revision was not bumped since
this is an issue that exhibits at build time only.

Package-Manager: portage-2.3.0

6 files changed, 95 insertions, 117 deletions

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 99faa1e96711..c53760119db9 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,5 +1,2 @@
-DIST ophcrack-3.1.0.tar.bz2 238869 SHA256 706bee5d11d246ae16cbca87436a70f0e6f6dbc7d49d14318c1c71e74f5e069d SHA512 7292ba86f4a346644f9b35fef34693315315ef2ce105d9159bb7958527d62cb57f40f7acb7140c7103f729e2d29d6c009d6f29ec25e9d649963e071adb96e1ad WHIRLPOOL c403b84957d9d6037e7e035aaca0215e6c7749c899d35edad5740ff5d370a7fda2faf6c067eef5b793d156e965642ac64f0c8ec2a2c41f344aff9bbd1be15c16
-DIST ophcrack-3.3.0.tar.bz2 255049 SHA256 4c46f839cc752e6e9c69196574fa1fd17ff4e1bc4c1d1c0faa4b9228a3509a92 SHA512 91bcaf73d1dd22f6a0895c54dcaab48fe2157a9ef44110401bf507cca7bf599506e263a01f4539a81b3f4484af8a1c465d8eb90ea13c35383166b2e1822a1231 WHIRLPOOL 81597fa07b02d88159bd3c6e98d4d4f264066f24eae1e4b908006d544c605e32c02de8738535ff0e61d3b64a759d6d2a27981cf76fb095a6979e77d4ecd9184f
-DIST ophcrack-3.3.1.tar.bz2 255238 SHA256 4e23bfccde7962a873cd0c44f4da626795aec17fcfb078f4329ec7145b218d18 SHA512 e5e889cbf6493d56afe0c76e0bccd5c544665057ed7cfc46a9f636b1660351fedb704e5b76f8a3ed76c70be4ab0d8c855b0d7b58aa949b12e513e3ad08db8ad0 WHIRLPOOL 8b14e4e04199b3a258f7914bafea3a13a1061ebb20614ead0dbb02a14f2dc2ba6d59affacc91e5f6ff837cb5e65bf16ac94d483d083445d8a2d45200843a1f04
 DIST ophcrack-3.4.0.tar.bz2 279806 SHA256 06cb22d95a8ded79eebb99ac19bd21b27321e85fe0f22f32407d0b925b66d3e3 SHA512 38c3b41e76be1b2990cbf6a8ddbe776df3d7821696e42939c759d554a7a52d40555f7e1c8f11e3ab7dc20b553f43d814e271d7519a3b4bb4f84b70468c123df0 WHIRLPOOL 887d9f397c061b06072cd48e15b89596c81c893d0cc1fb8eb960f0561249b0085025cfd88482aba8549414d3d634685503be14b9f97b16edc248859095a3a1dc
 DIST ophcrack-3.6.0.tar.bz2 288830 SHA256 79219baa03afd7e52bc6d365dd5a445bc73dfac2e88216e7b050ad7749191893 SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9 WHIRLPOOL 5e492257aa504883892cc5bf19e123330963257874f2b1ad3ed53895161987012c6bd23f449c72de81e68ac0ebcb7adbff77883f1a0d976c0aa99654c87d342e
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
new file mode 100644
index 000000000000..2515c178abb7
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
@@ -0,0 +1,92 @@
+--- a/src/lmtable.c	2013-06-04 07:42:47 UTC
++++ b/src/lmtable.c
+@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
+ /*-------------------------------------------------------------------------*/
+ void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
+   uchar_t key[8];
+-  des_key_schedule ks;
+-  des_cblock *magic = (des_cblock*)lmmagic;
++  DES_key_schedule ks;
++  DES_cblock *magic = (DES_cblock*)lmmagic;
+   
+   key[0] = pwd[0];
+   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
+@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
+   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
+   key[7] = (pwd[6] << 1) ;
+ 
+-  des_set_odd_parity(&key);
+-  des_set_key(&key, ks);
+-  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
++  DES_set_odd_parity(&key);
++  DES_set_key(&key, &ks);
++  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
+ }
+
+--- a/src/samdump2/samdump2.c	2015-03-30 02:26:33 UTC
++++ b/src/samdump2/samdump2.c
+@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
+ 	for (i=0;i<8;i++) {
+ 		key[i] = (key[i]<<1);
+ 	}
+-	des_set_odd_parity((des_cblock *)key);
++	DES_set_odd_parity((DES_cblock *)key);
+ }
+ 
+ /*
+@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
+   unsigned char hbootkey[0x20];
+   
+   /* Des */
+-  des_key_schedule ks1, ks2;
+-  des_cblock deskey1, deskey2;
++  DES_key_schedule ks1, ks2;
++  DES_cblock deskey1, deskey2;
+   
+   int i, j;
+   
+@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
+       
+       /* Get the two decrpt keys. */
+       sid_to_key1(rid,(unsigned char *)deskey1);
+-      des_set_key_checked((des_cblock *)deskey1,ks1);
++      DES_set_key_checked((DES_cblock *)deskey1, &ks1);
+       sid_to_key2(rid,(unsigned char *)deskey2);
+-      des_set_key_unchecked((des_cblock *)deskey2,ks2);
++      DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
+       
+       /* Decrypt the lanman password hash as two 8 byte blocks. */
+-      des_ecb_encrypt((des_cblock *)obfkey,
+-		      (des_cblock *)fb, ks1, DES_DECRYPT);
+-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
+-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)obfkey,
++		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
++		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
+       
+       
+       
+@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
+       if (lm_size != 0x14) {
+ 	/* Get the two decrpt keys. */
+ 	sid_to_key1(rid,(unsigned char *)deskey1);
+-	des_set_key((des_cblock *)deskey1,ks1);
++	DES_set_key((DES_cblock *)deskey1, &ks1);
+ 	sid_to_key2(rid,(unsigned char *)deskey2);
+-	des_set_key((des_cblock *)deskey2,ks2);
++	DES_set_key((DES_cblock *)deskey2, &ks2);
+       }
+ 
+       /* Decrypt the NT md4 password hash as two 8 byte blocks. */
+-      des_ecb_encrypt((des_cblock *)obfkey,
+-		      (des_cblock *)fb, ks1, DES_DECRYPT);
+-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
+-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)obfkey,
++		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
++      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
++		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
+       
+       /* sf27 wrap to sf25 */
+       //sf27( obfkey, (int*)&rid, fb );
diff --git a/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild b/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild
deleted file mode 100644
index 0bcf27d01533..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug"
-
-CDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )"
-DEPEND="app-arch/unzip
-		virtual/pkgconfig
-		${CDEPEND}"
-RDEPEND="app-crypt/ophcrack-tables
-		 ${CDEPEND}"
-
-src_configure() {
-	econf $(use_enable qt4 gui) $(use_enable debug)
-}
-
-src_install() {
-	default
-
-	newicon src/gui/pixmaps/os.xpm ${PN}.xpm
-	make_desktop_entry "${PN}" OphCrack ${PN}
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.3.0.ebuild b/app-crypt/ophcrack/ophcrack-3.3.0.ebuild
deleted file mode 100644
index 0bcf27d01533..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug"
-
-CDEPEND="dev-libs/openssl
-		 net-libs/netwib
-		 qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )"
-DEPEND="app-arch/unzip
-		virtual/pkgconfig
-		${CDEPEND}"
-RDEPEND="app-crypt/ophcrack-tables
-		 ${CDEPEND}"
-
-src_configure() {
-	econf $(use_enable qt4 gui) $(use_enable debug)
-}
-
-src_install() {
-	default
-
-	newicon src/gui/pixmaps/os.xpm ${PN}.xpm
-	make_desktop_entry "${PN}" OphCrack ${PN}
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild b/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
deleted file mode 100644
index 1e1909f01a3c..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl qt4 +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
-		 libressl? ( dev-libs/libressl:0= )
-		 net-libs/netwib
-		 qt4? ( dev-qt/qtgui:4 )"
-DEPEND="app-arch/unzip
-		virtual/pkgconfig
-		${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-		 ${CDEPEND}"
-
-src_configure() {
-
-	local myconf
-
-	myconf="$(use_enable qt4 gui)"
-	myconf="${myconf} $(use_enable debug)"
-
-	econf ${myconf} || die "Failed to compile"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Installation failed."
-
-	cd "${S}"
-	newicon src/gui/pixmaps/os.xpm ophcrack.xpm
-	make_desktop_entry "${PN}" OphCrack ophcrack
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index 1e1909f01a3c..fc744fed51da 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -24,6 +24,8 @@ DEPEND="app-arch/unzip
 RDEPEND="tables? ( app-crypt/ophcrack-tables )
 		 ${CDEPEND}"
 
+PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
+
 src_configure() {
 
 	local myconf