mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 08:25:01 +01:00
samdump2: EAPI bump, fix errors while building
This commit is contained in:
Yury Martynov
parent
af2ee2505b
commit
14b537fef3
4 changed files with 101 additions and 12 deletions
|
|
@ -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
|
||||
|
|
|
|||
68
app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch
Normal file
68
app-crypt/samdump2/files/50_fix-openssl-1.1.0-compat.patch
Normal file
|
|
@ -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 );
|
||||
12
app-crypt/samdump2/metadata.xml
Normal file
12
app-crypt/samdump2/metadata.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>email@linxon.ru</email>
|
||||
<name>Yury Martynov</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue