mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00
Code Issues Releases Activity

Update to version 3.6.1, which brings compatibility with OpenSSL 1.1.0, and

Browse Source 
modernize Makefile a bit while here.

Reported by:	portscout
This commit is contained in:
Alexey Dokuchaev 2016-08-03 16:32:26 +00:00
parent ca086cb1ad
commit cd4f79228a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=419534
4 changed files with 6 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
security/ophcrack/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ophcrack
PORTVERSION= 3.6.0
PORTVERSION= 3.6.1
CATEGORIES= security
MASTER_SITES= SF
@ -14,15 +14,11 @@ LICENSE_COMB= multi
LIB_DEPENDS= libexpat.so:textproc/expat2
USES= gmake tar:bzip2
USES= gmake localbase ssl tar:bzip2
GNU_CONFIGURE= yes
USE_OPENSSL= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_FILES= bin/ophcrack
PORTDOCS= ChangeLog README
PORTDOCS= AUTHORS ChangeLog README
OPTIONS_DEFINE= X11 GRAPH DOCS
OPTIONS_DEFAULT= X11 GRAPH
@ -53,7 +49,7 @@ post-patch:
${WRKSRC}/src/samdump2/samdump2.c \
${WRKSRC}/src/misc.h
post-install:
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

4
security/ophcrack/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ophcrack-3.6.0.tar.bz2) = 79219baa03afd7e52bc6d365dd5a445bc73dfac2e88216e7b050ad7749191893
SIZE (ophcrack-3.6.0.tar.bz2) = 288830
SHA256 (ophcrack-3.6.1.tar.bz2) = 82dd1699eb7340ce8c7913758db2ab434659f8ad0a27abb186467627a0b8b798
SIZE (ophcrack-3.6.1.tar.bz2) = 296166

24
security/ophcrack/files/patch-src_lmtable.c
View File

@ -1,24 +0,0 @@
--- src/lmtable.c.orig 2013-06-04 07:42:47 UTC
+++ 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);
}

67
security/ophcrack/files/patch-src_samdump2_samdump2.c
View File

@ -1,67 +0,0 @@
--- src/samdump2/samdump2.c.orig 2015-03-30 02:26:33 UTC
+++ 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 );