Use 3proxy_crypt instead of mycrypt

Makefile.FreeBSD

@@ -49,7 +49,7 @@ include Makefile.inc
 install: all
 	if [ ! -d "/usr/local/3proxy/bin" ]; then mkdir -p /usr/local/3proxy/bin/; fi
 	install bin/3proxy /usr/local/3proxy/bin/3proxy
-	install bin/mycrypt /usr/local/3proxy/bin/mycrypt
+	install bin/3proxy_crypt /usr/local/3proxy/bin/3proxy_crypt
 	install scripts/rc.d/3proxy /usr/local/etc/rc.d/3proxy
 	install scripts/add3proxyuser.sh /usr/local/3proxy/bin/
 	if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then /usr/local/3proxy/3proxy.cfg already exists ; else install scripts/3proxy.cfg /usr/local/etc/3proxy/; fi

Makefile.Linux

@@ -62,7 +62,7 @@ INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
 INSTALL_OBJS	= bin/3proxy \
 		  bin/ftppr \
-		  bin/mycrypt \
+		  bin/3proxy_crypt \
 		  bin/pop3p \
 		  bin/proxy \
 		  bin/socks \

Makefile.openwrt-mips

@@ -63,7 +63,7 @@ INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
 INSTALL_OBJS	= src/3proxy \
 		  src/ftppr \
-		  src/mycrypt \
+		  src/3proxy_crypt \
 		  src/pop3p \
 		  src/proxy \
 		  src/socks \

Makefile.unix

@@ -51,7 +51,7 @@ include Makefile.inc
 install: all
     if [ ! -d "/usr/local/3proxy/bin" ]; then mkdir -p /usr/local/3proxy/bin/; fi
     install bin/3proxy /usr/local/3proxy/bin/3proxy
-    install bin/mycrypt /usr/local/3proxy/bin/mycrypt
+    install bin/3proxy_crypt /usr/local/3proxy/bin/3proxy_crypt
     install scripts/rc.d/3proxy /usr/local/etc/rc.d/3proxy
     install scripts/add3proxyuser.sh /usr/local/3proxy/bin/
     if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then /usr/local/3proxy/3proxy.cfg already exists ; else install scripts/3proxy.cfg /usr/local/etc/3proxy/; fi

README.md

@@ -200,7 +200,7 @@ sudo launchctl unload /Library/LaunchDaemons/org.3proxy.3proxy.plist
 - User authentication by DNS hostname
 - Authentication cache with possibility to limit user to single IP address
 - Access control by username/password for SOCKSv5 and HTTP/HTTPS/FTP
-- Cleartext or encrypted (crypt/MD5 or NT) passwords
+- Cleartext or encrypted passwords
 - Connection redirection
 - Access control by requested action (CONNECT/BIND, HTTP GET/POST/PUT/HEAD/OTHER)
 - All access control entries now support weekday and time limitations
@@ -286,12 +286,12 @@ TLS proxy (SNI proxy) - sniffs hostname from TLS handshake
 ### udppm
 UDP port mapping. Maps some UDP port on local machine to UDP port on remote machine. Only one user simultaneously can use UDP mapping, so it can't be used for public service in large networks. It's OK to use it to map to DNS server in small network or to map Counter-Strike server for single client (you can use few mappings on different ports for different clients in last case).
 
-### mycrypt
+### 3proxy_crypt
 Program to obtain crypted password for cleartext. Supports both MD5/crypt and NT password.
 
 ```bash
-mycrypt password          # produces NT password
-mycrypt salt password     # produces MD5/crypt password with salt "salt"
+3proxy_crypt password          # produces NT password
+3proxy_crypt salt password     # produces password hash with salt "salt"
 ```
 
 ---

doc/html/howtoe.html

@@ -969,7 +969,7 @@ or
 <pre>
 users $"c:\Program Files\3proxy\passwords"
 </pre>
-It's possible to create NT and crypt passwords with the mycrypt utility included
+It's possible to create NT and crypt passwords with the 3proxy_crypt utility included
 in the distribution.
 <br>The user list is system-wide. To manage user access to a specific service, use ACLs.
 </p>

doc/html/howtor.html

@@ -983,7 +983,7 @@ openssl pkcs12 -export -out client.p12 -passout pass: \
   или
   <pre>
   users $"c:\Program Files\3proxy\passwords"</pre>
-  Шифрованные NT и crypt пароли можно создавать с помощью утилиты mycrypt.
+  Шифрованные NT и crypt пароли можно создавать с помощью утилиты 3proxy_crypt.
   <br>Список пользователей един для всех служб. Разграничение доступа по службам
   необходимо производить с помощью списков доступа.
   </p>

scripts/add3proxyuser.sh

@@ -6,7 +6,7 @@ if [ $3 ]; then
 	echo countin \"`wc -l /etc/3proxy/conf/counters|awk '{print $1}'`/$1\" D $3 $1 >> /etc/3proxy/conf/counters
 fi
 if [ $2 ]; then  
-	echo $1:`/bin/mycrypt $$ $2` >> /etc/3proxy/conf/passwd
+	echo $1:`/bin/3proxy_crypt $$ $2` >> /etc/3proxy/conf/passwd
 else
 	echo usage: $0 username password [day_limit] [bandwidth]
 	echo "	"day_limit - traffic limit in MB per day

scripts/rh/3proxy.spec

@@ -33,7 +33,7 @@ make clean
 %files
 /bin/3proxy
 /bin/ftppr
-/bin/mycrypt
+/bin/3proxy_crypt
 /bin/pop3p
 /bin/proxy
 /bin/socks