View | Details | Raw Unified | Return to bug 198184
Collapse All | Expand All

(-)files/patch-src__dissectors__ec_ssh.c (+44 lines)
Line 0 Link Here
1
--- src/dissectors/ec_ssh.c.orig	2014-10-16 19:29:44.000000000 +0200
2
+++ src/dissectors/ec_ssh.c	2015-02-28 12:33:17.016918597 +0100
3
@@ -87,8 +87,8 @@
4
 
5
 struct des3_state
6
 {
7
-   des_key_schedule k1, k2, k3;
8
-   des_cblock iv1, iv2, iv3;
9
+   DES_key_schedule k1, k2, k3;
10
+   DES_cblock iv1, iv2, iv3;
11
 };
12
 
13
 struct blowfish_state 
14
@@ -608,13 +608,13 @@
15
    if (state == NULL) /* oops, couldn't allocate memory */
16
       return NULL;
17
 
18
-   des_set_key((void *)sesskey, (state->k1));
19
-   des_set_key((void *)(sesskey + 8), (state->k2));
20
+   DES_set_key((void *)sesskey, &(state->k1));
21
+   DES_set_key((void *)(sesskey + 8), &(state->k2));
22
 
23
    if (len <= 16)
24
-      des_set_key((void *)sesskey, (state->k3));
25
+      DES_set_key((void *)sesskey, &(state->k3));
26
    else
27
-      des_set_key((void *)(sesskey + 16), (state->k3));
28
+      DES_set_key((void *)(sesskey + 16), &(state->k3));
29
 
30
    memset(state->iv1, 0, 8);
31
    memset(state->iv2, 0, 8);
32
@@ -630,9 +630,9 @@
33
    dstate = (struct des3_state *)state;
34
    memcpy(dstate->iv1, dstate->iv2, 8);
35
 
36
-   des_ncbc_encrypt(src, dst, len, (dstate->k3), &dstate->iv3, DES_DECRYPT);
37
-   des_ncbc_encrypt(dst, dst, len, (dstate->k2), &dstate->iv2, DES_ENCRYPT);
38
-   des_ncbc_encrypt(dst, dst, len, (dstate->k1), &dstate->iv1, DES_DECRYPT);
39
+   DES_ncbc_encrypt(src, dst, len, &(dstate->k3), &dstate->iv3, DES_DECRYPT);
40
+   DES_ncbc_encrypt(dst, dst, len, &(dstate->k2), &dstate->iv2, DES_ENCRYPT);
41
+   DES_ncbc_encrypt(dst, dst, len, &(dstate->k1), &dstate->iv1, DES_DECRYPT);
42
 }
43
 
44
 static void swap_bytes(const u_char *src, u_char *dst, int n)

Return to bug 198184