diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-03-03 15:41:56 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-03-03 15:41:56 +0000 |
| commit | d3f0c20189668c0c4964e26049b7e81c6a358b3e (patch) | |
| tree | c2fc973b0941e2b9ca9868a5768720400bce7862 /net-mgmt/ettercap | |
| parent | e0d98e9032e69983ac4de818e0166bf22cc974db (diff) | |
| download | ports-d3f0c20189668c0c4964e26049b7e81c6a358b3e.tar.gz ports-d3f0c20189668c0c4964e26049b7e81c6a358b3e.zip | |
- Replace deprecated des_* methods with DES_* ones
PR: 198184
Submitted by: Bernard Spil <spil.oss@gmail.com>
Obtained from: https://github.com/Ettercap/ettercap/commit/f71cd222712d6ecec6f086f3b8acca981e25f819
Notes
Notes:
svn path=/head/; revision=380379
Diffstat (limited to 'net-mgmt/ettercap')
| -rw-r--r-- | net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c b/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c new file mode 100644 index 000000000000..cf9e2cfe891f --- /dev/null +++ b/net-mgmt/ettercap/files/patch-src-dissectors-ec_ssh.c @@ -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) |