Attachment 153675 Details for Bug 198184 – svn diff for net-mgmt/ettercap

[patch] svn diff for net-mgmt/ettercap

patch-ettercap-libressl.svndiff (text/plain), 2.18 KB, created by Bernard Spil on 2015-03-02 19:21:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-03-02 19:21:28 UTC

Size: 2.18 KB

patch

obsolete

>Index: files/patch-src__dissectors__ec_ssh.c
>===================================================================
>--- files/patch-src__dissectors__ec_ssh.c	(revision 0)
>+++ files/patch-src__dissectors__ec_ssh.c	(working copy)
>@@ -0,0 +1,44 @@
>+--- src/dissectors/ec_ssh.c.orig	2014-10-16 19:29:44.000000000 +0200
>++++ src/dissectors/ec_ssh.c	2015-02-28 12:33:17.016918597 +0100
>+@@ -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)
>
>Property changes on: files/patch-src__dissectors__ec_ssh.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198184: 153675