Index: head/security/chntpw/Makefile =================================================================== --- head/security/chntpw/Makefile (revision 534072) +++ head/security/chntpw/Makefile (revision 534073) @@ -1,37 +1,34 @@ # Created by: buganini@gmail.com # $FreeBSD$ PORTNAME= chntpw -PORTVERSION= 110511 -PORTREVISION= 2 +PORTVERSION= 140201 CATEGORIES= security sysutils MASTER_SITES= http://pogostick.net/~pnh/ntpasswd/ DISTNAME= ${PORTNAME}-source-${PORTVERSION} -MAINTAINER= buganini@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Utility to set the password and edit registry on Microsoft NT system LICENSE= GPLv2 -OPTIONS_DEFINE= DOCS - USES= gmake zip ssl - BIN_FILES= chntpw cpnt reged PLIST_FILES= ${BIN_FILES:C|^|bin/|} PORTDOCS= README.txt WinReg.txt regedit.txt - WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^CC=/d; /^OSSLPATH=/ s|=.*|=${OPENSSLBASE}|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e '/^CFLAGS=/ s| -m32||' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${BIN_FILES:C|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/security/chntpw/distinfo =================================================================== --- head/security/chntpw/distinfo (revision 534072) +++ head/security/chntpw/distinfo (revision 534073) @@ -1,2 +1,3 @@ -SHA256 (chntpw-source-110511.zip) = 593514ca8601adb4091d951499b916dfdac2bd34b325d307237fa52ca572b5b7 -SIZE (chntpw-source-110511.zip) = 758936 +TIMESTAMP = 1516608504 +SHA256 (chntpw-source-140201.zip) = 96e20905443e24cba2f21e51162df71dd993a1c02bfa12b1be2d0801a4ee2ccc +SIZE (chntpw-source-140201.zip) = 1404098 Index: head/security/chntpw/files/patch-chntpw.c =================================================================== --- head/security/chntpw/files/patch-chntpw.c (revision 534072) +++ head/security/chntpw/files/patch-chntpw.c (revision 534073) @@ -1,100 +1,100 @@ ---- chntpw.c.orig 2011-05-11 19:33:56 UTC +--- chntpw.c.orig 2020-05-05 11:29:42 UTC +++ chntpw.c -@@ -142,7 +142,7 @@ void str_to_key(unsigned char *str,unsig +@@ -155,7 +155,7 @@ void str_to_key(unsigned char *str,unsigned char *key) 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); } /* -@@ -187,16 +187,16 @@ void sid_to_key2(uint32_t sid,unsigned c +@@ -200,16 +200,16 @@ void sid_to_key2(uint32_t sid,unsigned char deskey[8]) void E1(uchar *k, uchar *d, uchar *out) { - des_key_schedule ks; - des_cblock deskey; + DES_key_schedule ks; + DES_cblock deskey; str_to_key(k,(uchar *)deskey); #ifdef __FreeBSD__ - des_set_key(&deskey,ks); + DES_set_key(&deskey,&ks); #else /* __FreeBsd__ */ - des_set_key((des_cblock *)deskey,ks); + DES_set_key((DES_cblock *)deskey,&ks); #endif /* __FreeBsd__ */ - des_ecb_encrypt((des_cblock *)d,(des_cblock *)out, ks, DES_ENCRYPT); + DES_ecb_encrypt((DES_cblock *)d,(DES_cblock *)out, &ks, DES_ENCRYPT); } - -@@ -504,8 +504,8 @@ char *change_pw(char *buf, int rid, int - int dontchange = 0; - struct user_V *v; - + #endif /* DOCRYPTO */ +@@ -343,8 +343,8 @@ char *change_pw(char *buf, int rid, int vlen, int stat + int i; + char md4[32],lanman[32]; + char newunipw[34], despw[20], newlanpw[16], newlandes[20]; - des_key_schedule ks1, ks2; - des_cblock deskey1, deskey2; + DES_key_schedule ks1, ks2; + DES_cblock deskey1, deskey2; - MD4_CTX context; unsigned char digest[16]; -@@ -623,21 +623,21 @@ char *change_pw(char *buf, int rid, int - + uchar x1[] = {0x4B,0x47,0x53,0x21,0x40,0x23,0x24,0x25}; +@@ -462,21 +462,21 @@ char *change_pw(char *buf, int rid, int vlen, int stat + #ifdef DOCRYPTO /* 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 *)(vp+ntpw_offs ), - (des_cblock *)md4, ks1, DES_DECRYPT); - des_ecb_encrypt((des_cblock *)(vp+ntpw_offs + 8), - (des_cblock *)&md4[8], ks2, DES_DECRYPT); + DES_ecb_encrypt((DES_cblock *)(vp+ntpw_offs ), + (DES_cblock *)md4, &ks1, DES_DECRYPT); + DES_ecb_encrypt((DES_cblock *)(vp+ntpw_offs + 8), + (DES_cblock *)&md4[8], &ks2, DES_DECRYPT); /* Decrypt the lanman password hash as two 8 byte blocks. */ - des_ecb_encrypt((des_cblock *)(vp+lmpw_offs), - (des_cblock *)lanman, ks1, DES_DECRYPT); - des_ecb_encrypt((des_cblock *)(vp+lmpw_offs + 8), - (des_cblock *)&lanman[8], ks2, DES_DECRYPT); + DES_ecb_encrypt((DES_cblock *)(vp+lmpw_offs), + (DES_cblock *)lanman, &ks1, DES_DECRYPT); + DES_ecb_encrypt((DES_cblock *)(vp+lmpw_offs + 8), + (DES_cblock *)&lanman[8], &ks2, DES_DECRYPT); if (gverbose) { hexprnt("MD4 hash : ",(unsigned char *)md4,16); -@@ -705,15 +705,15 @@ char *change_pw(char *buf, int rid, int +@@ -556,15 +556,15 @@ char *change_pw(char *buf, int rid, int vlen, int stat if (gverbose) hexprnt("NEW LANMAN hash : ",(unsigned char *)lanman,16); /* Encrypt the NT md4 password hash as two 8 byte blocks. */ - des_ecb_encrypt((des_cblock *)digest, - (des_cblock *)despw, ks1, DES_ENCRYPT); - des_ecb_encrypt((des_cblock *)(digest+8), - (des_cblock *)&despw[8], ks2, DES_ENCRYPT); + DES_ecb_encrypt((DES_cblock *)digest, + (DES_cblock *)despw, &ks1, DES_ENCRYPT); + DES_ecb_encrypt((DES_cblock *)digest, + (DES_cblock *)&despw[8], &ks2, DES_ENCRYPT); - des_ecb_encrypt((des_cblock *)lanman, - (des_cblock *)newlandes, ks1, DES_ENCRYPT); - des_ecb_encrypt((des_cblock *)(lanman+8), - (des_cblock *)&newlandes[8], ks2, DES_ENCRYPT); + DES_ecb_encrypt((DES_cblock *)lanman, + (DES_cblock *)newlandes, &ks1, DES_ENCRYPT); + DES_ecb_encrypt((DES_cblock *)(lanman+8), + (DES_cblock *)&newlandes[8], &ks2, DES_ENCRYPT); if (gverbose) { hexprnt("NEW DES crypt : ",(unsigned char *)despw,16);