sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slightly crude fix for libcipher removal. Improvements welcome.

Browse source
This commit is contained in:
Mark Murray 2003-06-10 13:06:41 +00:00
parent 193f0869c3
commit cb350defb6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=82675
2 changed files with 86 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/xisp/files/patch-Makefile
View file

@ -1,5 +1,5 @@
--- Makefile.orig Mon Feb 3 04:59:04 2003
+++ Makefile Mon Feb 3 04:59:28 2003
--- Makefile.orig Tue Jun 10 13:24:04 2003
+++ Makefile Tue Jun 10 13:48:35 2003
@@ -13,8 +13,8 @@
#=====================================================================
#
@ -11,3 +11,14 @@
INCX11 = $(X11PREFIX)/include
LIBX11 = $(X11PREFIX)/lib
INCFORMS = $(X11PREFIX)/include/X11
@@ -223,8 +223,8 @@
GROUP = dialer
CHAT_PATH = /usr/bin
PPPD_PATH = /usr/sbin
-CCFLAGS = -Wall -O
-EXTRALIBS = -lcipher
+CCFLAGS = -Wall -O -DUSE_OPENSSL
+EXTRALIBS = -lcrypto
LINKX11 = -Wl,-R$(LIBX11)
LINKFORMS = -L$(LIBFORMS) -lforms
INSTALL = /usr/bin/install

73
net/xisp/files/patch-pcode.c Normal file
View file

@ -0,0 +1,73 @@
--- pcode.c.orig Tue Jun 10 13:30:26 2003
+++ pcode.c Tue Jun 10 14:02:23 2003
@@ -21,10 +21,14 @@
/* Password encryption/decryption data structures and routines */
#include <sys/param.h>
+#if defined(USE_OPENSSL)
+#include <openssl/des.h>
+#else /* ! OpenSSL */
#if (defined(BSD) && BSD >= 199306)
#include <unistd.h>
#include <stdlib.h>
#endif
+#endif /* OpenSSL */
static unsigned char pkey[8] = {0x87,0xB6,0xAC,0xAF,0xC6,0xC8,0x94,0x8C},
ukey[64], upwd[64];
@@ -68,15 +72,27 @@
void pencode(unsigned char *ep, unsigned char *pp)
{
int i;
+#if defined(USE_OPENSSL)
+ DES_key_schedule key;
+#else
#if !(defined(BSD) && BSD >= 199306)
void setkey(), encrypt();
#endif
+#endif
cupack(ukey, pkey); /* unpack the key */
+#if defined(USE_OPENSSL)
+ DES_set_key((DES_cblock *)ukey, &key);
+#else
setkey(ukey); /* insert it in crypt's machine */
+#endif
for (i=0; i<8; i++) { /* do all 64 bytes */
cupack(upwd, pp); /* unpack the plain-text password */
+#if defined(USE_OPENSSL)
+ DES_ecb_encrypt((const_DES_cblock *)upwd, (DES_cblock *)upwd, &key, 1);
+#else
encrypt(upwd, 0); /* encrypt it in place */
+#endif
cpack(ep, upwd); /* copy it out into the result */
ep += 8; pp += 8; /* get next 8 bytes */
}
@@ -86,15 +102,27 @@
void pdecode(unsigned char *pp, unsigned char *ep)
{
int i;
+#if defined(USE_OPENSSL)
+ DES_key_schedule key;
+#else
#if !(defined(BSD) && BSD >= 199306)
void setkey(), encrypt();
#endif
+#endif
cupack(ukey, pkey); /* unpack the key */
+#if defined(USE_OPENSSL)
+ DES_set_key((DES_cblock *)ukey, &key);
+#else
setkey(ukey); /* insert it in crypt's machine */
+#endif
for (i=0; i<8; i++) { /* do all 64 bytes */
cupack(upwd, ep); /* unpack the encrypted password */
+#if defined(USE_OPENSSL)
+ DES_ecb_encrypt((const_DES_cblock *)upwd, (DES_cblock *)upwd, &key, 0);
+#else
encrypt(upwd, 1); /* decrypt it in place */
+#endif
cpack(pp, upwd); /* copy it out into the result */
ep += 8; pp += 8; /* get next 8 bytes */
}