From 14b537fef3e9bcef56b6ae6880c025ff2d8332d9 Mon Sep 17 00:00:00 2001 From: Yury Martynov Date: Wed, 6 Nov 2019 18:23:13 +0300 Subject: [PATCH] samdump2: EAPI bump, fix errors while building --- app-crypt/samdump2/Manifest | 2 +- .../files/50_fix-openssl-1.1.0-compat.patch | 68 +++++++++++++++++++ app-crypt/samdump2/metadata.xml | 12 ++++ app-crypt/samdump2/samdump2-3.0.0-r1.ebuild | 31 ++++++--- 4 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch create mode 100644 app-crypt/samdump2/metadata.xml diff --git a/app-crypt/samdump2/Manifest b/app-crypt/samdump2/Manifest index 8fcdc0ed5..40ce9d036 100644 --- a/app-crypt/samdump2/Manifest +++ b/app-crypt/samdump2/Manifest @@ -1 +1 @@ -DIST samdump2-3.0.0.tar.bz2 32784 SHA256 602659af30c565750fa01650e0a223d26355b5df98f2fbc30e3a6c593ed4e526 SHA512 57ff1f761e833346887ac7fdbc76e202822b306ce0a35af2a491dafc7b277836f3f113be6703c71be82828e8442e6ecd320cb88f4dcc7c5fbf7f2ca257abea95 WHIRLPOOL 364004f6782e334867332e78a6d0901ed2f0560317554f5bd8c5fece74aa3c823bb2c68bc0551dd0350dfccd95f7a0a0c3f5879f27a088b7b76507349978e029 +DIST samdump2-3.0.0.tar.bz2 32784 BLAKE2B 7371b2a6d565a3d24e8849a223b8ba7befd1dd4e02dfcbf50627bc8dbe05669650f29e4c391c41d175ac5c214e8a664cdca99d48acedf28a7f4db56744666470 SHA512 57ff1f761e833346887ac7fdbc76e202822b306ce0a35af2a491dafc7b277836f3f113be6703c71be82828e8442e6ecd320cb88f4dcc7c5fbf7f2ca257abea95 diff --git a/app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch b/app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch new file mode 100644 index 000000000..500ad5f4c --- /dev/null +++ b/app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch @@ -0,0 +1,68 @@ +diff -ur a/samdump2.c b/samdump2.c +--- a/samdump2.c 2012-04-20 16:27:00.000000000 +0400 ++++ b/samdump2.c 2019-11-06 18:18:16.289975636 +0300 +@@ -72,7 +72,7 @@ + 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); + } + + /* +@@ -210,8 +210,8 @@ + 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; + +@@ -419,15 +419,15 @@ + + /* 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); + + + +@@ -472,16 +472,16 @@ + 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/samdump2/metadata.xml b/app-crypt/samdump2/metadata.xml new file mode 100644 index 000000000..aa584e61a --- /dev/null +++ b/app-crypt/samdump2/metadata.xml @@ -0,0 +1,12 @@ + + + + + email@linxon.ru + Yury Martynov + + + proxy-maint@gentoo.org + Proxy Maintainers + + diff --git a/app-crypt/samdump2/samdump2-3.0.0-r1.ebuild b/app-crypt/samdump2/samdump2-3.0.0-r1.ebuild index 4636e028b..1df8d9a21 100644 --- a/app-crypt/samdump2/samdump2-3.0.0-r1.ebuild +++ b/app-crypt/samdump2/samdump2-3.0.0-r1.ebuild @@ -1,30 +1,39 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=5 +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Windows NT/2k/XP/Vista sam hash dumper" -HOMEPAGE="http://sourceforge.net/projects/ophcrack/files/" +HOMEPAGE="https://sourceforge.net/projects/ophcrack/files/" SRC_URI="mirror://sourceforge/ophcrack/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" -IUSE="" +KEYWORDS="~amd64 ~arm ~x86" -DEPEND="" +DEPEND="dev-libs/openssl:=" RDEPEND="${DEPEND}" src_prepare() { - sed -e 's|= -lssl|= -lssl -lcrypto|g' -i Makefile + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=828537 + eapply "${FILESDIR}"/50_fix-openssl-1.1.0-compat.patch + + sed -i \ + -e "s|CFLAGS =|CFLAGS +=|" \ + -e 's|= -lssl|= -lssl -lcrypto|g' \ + -e "s|VERSION = \(.*\)|VERSION = ${PV}|" \ + Makefile || die + + default } src_compile() { - emake || die "emake failed" + emake CC="$(tc-getCC)" } src_install() { - dobin samdump2 || die "install failed" - doman samdump2.1 || die "install failed" + dobin samdump2 + doman samdump2.1 }