mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

- Replace deprecated des_* methods with DES_* ones

Browse Source 
PR:		198184
Submitted by:	Bernard Spil <spil.oss@gmail.com>
Obtained from:	f71cd22271
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2015-03-03 15:41:56 +00:00
parent e0d98e9032
commit d3f0c20189
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=380379
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c Normal file
View File

@ -0,0 +1,46 @@
Obtained from: https://github.com/Ettercap/ettercap/commit/f71cd222712d6ecec6f086f3b8acca981e25f819
--- src/dissectors/ec_ssh.c.orig 2014-10-17 01:29:44.000000000 +0800
+++ src/dissectors/ec_ssh.c 2015-03-03 03:43:40.843089707 +0800
@@ -87,8 +87,8 @@
struct des3_state
{
- des_key_schedule k1, k2, k3;
- des_cblock iv1, iv2, iv3;
+ DES_key_schedule k1, k2, k3;
+ DES_cblock iv1, iv2, iv3;
};
struct blowfish_state
@@ -608,13 +608,13 @@
if (state == NULL) /* oops, couldn't allocate memory */
return NULL;
- des_set_key((void *)sesskey, (state->k1));
- des_set_key((void *)(sesskey + 8), (state->k2));
+ DES_set_key((void *)sesskey, &(state->k1));
+ DES_set_key((void *)(sesskey + 8), &(state->k2));
if (len <= 16)
- des_set_key((void *)sesskey, (state->k3));
+ DES_set_key((void *)sesskey, &(state->k3));
else
- des_set_key((void *)(sesskey + 16), (state->k3));
+ DES_set_key((void *)(sesskey + 16), &(state->k3));
memset(state->iv1, 0, 8);
memset(state->iv2, 0, 8);
@@ -630,9 +630,9 @@
dstate = (struct des3_state *)state;
memcpy(dstate->iv1, dstate->iv2, 8);
- des_ncbc_encrypt(src, dst, len, (dstate->k3), &dstate->iv3, DES_DECRYPT);
- des_ncbc_encrypt(dst, dst, len, (dstate->k2), &dstate->iv2, DES_ENCRYPT);
- des_ncbc_encrypt(dst, dst, len, (dstate->k1), &dstate->iv1, DES_DECRYPT);
+ DES_ncbc_encrypt(src, dst, len, &(dstate->k3), &dstate->iv3, DES_DECRYPT);
+ DES_ncbc_encrypt(dst, dst, len, &(dstate->k2), &dstate->iv2, DES_ENCRYPT);
+ DES_ncbc_encrypt(dst, dst, len, &(dstate->k1), &dstate->iv1, DES_DECRYPT);
}
static void swap_bytes(const u_char *src, u_char *dst, int n)