Index: head/security/chntpw/Makefile
===================================================================
--- head/security/chntpw/Makefile	(revision 383203)
+++ head/security/chntpw/Makefile	(revision 383204)
@@ -1,46 +1,46 @@
 # Created by: buganini@gmail.com
 # $FreeBSD$
 
 PORTNAME=	chntpw
 PORTVERSION=	110511
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security sysutils
 MASTER_SITES=	http://pogostick.net/~pnh/ntpasswd/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Utility to set the password and edit registry on Microsoft NT system
 
 LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS
 
 USE_OPENSSL=	yes
 USES=		gmake zip
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 BIN_FILES=	chntpw cpnt reged
 PLIST_FILES=	${BIN_FILES:C|^|bin/|}
 PORTDOCS=	README.txt WinReg.txt regedit.txt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CC=/d; /^OSSLPATH=/ s|=.*|=${OPENSSLBASE}|' ${WRKSRC}/Makefile
 .if ${ARCH} == "amd64"
 	@${REINPLACE_CMD} -e '/^CFLAGS=/ s| -m32||' ${WRKSRC}/Makefile
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/security/chntpw/files/patch-chntpw.c
===================================================================
--- head/security/chntpw/files/patch-chntpw.c	(nonexistent)
+++ head/security/chntpw/files/patch-chntpw.c	(revision 383204)
@@ -0,0 +1,100 @@
+--- chntpw.c.orig	2011-05-11 19:33:56 UTC
++++ chntpw.c
+@@ -142,7 +142,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);
+ }
+ 
+ /*
+@@ -187,16 +187,16 @@ void sid_to_key2(uint32_t sid,unsigned c
+ 
+ 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;
+ 
+-   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 
+ 
+    /* 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 
+      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);

Property changes on: head/security/chntpw/files/patch-chntpw.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property