mirror of
git://slackware.nl/current.git
synced 2024-11-16 07:48:02 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
114 lines
3.3 KiB
Diff
114 lines
3.3 KiB
Diff
--- ./src/pdes.c.orig 2000-05-21 14:07:05.000000000 -0500
|
|
+++ ./src/pdes.c 2018-05-07 17:03:36.483003872 -0500
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
|
|
|
-static des_key_schedule sched;
|
|
+static DES_key_schedule sched;
|
|
|
|
|
|
|
|
@@ -55,7 +55,7 @@
|
|
{
|
|
char keybuf[1024+1];
|
|
int fd, res;
|
|
- des_cblock key_bin;
|
|
+ DES_cblock key_bin;
|
|
|
|
|
|
if (keyfile == NULL)
|
|
@@ -100,8 +100,8 @@
|
|
}
|
|
|
|
keybuf[sizeof(keybuf)-1] = '\0';
|
|
- des_string_to_key(keybuf, &key_bin);
|
|
- des_set_key(&key_bin, sched);
|
|
+ DES_string_to_key(keybuf, &key_bin);
|
|
+ DES_set_key(&key_bin, &sched);
|
|
|
|
return 0;
|
|
}
|
|
@@ -136,20 +136,20 @@
|
|
for (i = 1; i < 6; i++)
|
|
r.longs[0] ^= r.longs[i];
|
|
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[0]), (des_cblock *)&(r.longs[0]),
|
|
- sched, DES_ENCRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[0]), (DES_cblock *)&(r.longs[0]),
|
|
+ &sched, DES_ENCRYPT);
|
|
|
|
r.longs[2] ^= r.longs[0];
|
|
r.longs[3] ^= r.longs[1];
|
|
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[2]), (des_cblock *)&(r.longs[2]),
|
|
- sched, DES_ENCRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[2]), (DES_cblock *)&(r.longs[0]),
|
|
+ &sched, DES_ENCRYPT);
|
|
|
|
r.longs[4] ^= r.longs[2];
|
|
r.longs[5] ^= r.longs[3];
|
|
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[4]), (des_cblock *)&(r.longs[4]),
|
|
- sched, DES_ENCRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[4]), (DES_cblock *)&(r.longs[0]),
|
|
+ &sched, DES_ENCRYPT);
|
|
|
|
for (i = 0, j = 0; i < 24; i+=3, j+=4)
|
|
{
|
|
--- ./src/idecrypt.c.orig 2001-04-23 15:40:15.000000000 -0500
|
|
+++ ./src/idecrypt.c 2018-05-07 17:04:20.897003874 -0500
|
|
@@ -100,8 +100,8 @@
|
|
char buf1[32], buf2[32];
|
|
struct sockaddr_gen ip_local, ip_remote;
|
|
int keyfile_fd;
|
|
- des_cblock key_bin;
|
|
- des_key_schedule sched;
|
|
+ DES_cblock key_bin;
|
|
+ DES_key_schedule sched;
|
|
static char readable[256];
|
|
|
|
|
|
@@ -118,9 +118,8 @@
|
|
while (read(keyfile_fd, keybuf, sizeof(keybuf)-1) == sizeof(keybuf)-1)
|
|
{
|
|
keybuf[sizeof(keybuf)-1] = '\0';
|
|
- des_string_to_key(keybuf, &key_bin);
|
|
- des_set_key(&key_bin, sched);
|
|
-
|
|
+ DES_string_to_key(keybuf, &key_bin);
|
|
+ DES_set_key(&key_bin, &sched);
|
|
|
|
for (i = 0, j = 0; i < 24; i += 3, j += 4)
|
|
{
|
|
@@ -129,21 +128,21 @@
|
|
r.chars[i+2] = (to_bin[packet[j+2]] << 6) + (to_bin[packet[j+3]]);
|
|
}
|
|
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[4]),
|
|
- (des_cblock *)&(r.longs[4]),
|
|
- sched, DES_DECRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[i+2]),
|
|
+ (DES_cblock *)&(r.longs[i+2]),
|
|
+ &sched, DES_DECRYPT);
|
|
r.longs[4] ^= r.longs[2];
|
|
r.longs[5] ^= r.longs[3];
|
|
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[2]),
|
|
- (des_cblock *)&(r.longs[2]),
|
|
- sched, DES_DECRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[0]),
|
|
+ (DES_cblock *)&(r.longs[0]),
|
|
+ &sched, DES_DECRYPT);
|
|
|
|
r.longs[2] ^= r.longs[0];
|
|
r.longs[3] ^= r.longs[1];
|
|
- des_ecb_encrypt((des_cblock *)&(r.longs[0]),
|
|
- (des_cblock *)&(r.longs[0]),
|
|
- sched, DES_DECRYPT);
|
|
+ DES_ecb_encrypt((DES_cblock *)&(r.longs[0]),
|
|
+ (DES_cblock *)&(r.longs[0]),
|
|
+ &sched, DES_DECRYPT);
|
|
|
|
for (i = 1; i < 6; i++)
|
|
{
|