diff options
author | brnrd <brnrd@FreeBSD.org> | 2016-06-13 01:17:01 +0800 |
---|---|---|
committer | brnrd <brnrd@FreeBSD.org> | 2016-06-13 01:17:01 +0800 |
commit | 7364b97ed86d3309ec6542340127e144b621202b (patch) | |
tree | f9c2150046609a464afcb1ece6c47d10703c9508 /ftp | |
parent | 34f784fce198cd73dce30034d2348757b86e21d7 (diff) | |
download | freebsd-ports-gnome-7364b97ed86d3309ec6542340127e144b621202b.tar.gz freebsd-ports-gnome-7364b97ed86d3309ec6542340127e144b621202b.tar.zst freebsd-ports-gnome-7364b97ed86d3309ec6542340127e144b621202b.zip |
ftp/pavuk: Fix build with OpenSSL 1.1 / LibreSSL
- Replace deprecated des_ methods with their DES_ equivalents
PR: 198333
Sponsored by: BSDCan 2016
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/pavuk/files/patch-src__ntlm_auth.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/ftp/pavuk/files/patch-src__ntlm_auth.c b/ftp/pavuk/files/patch-src__ntlm_auth.c new file mode 100644 index 000000000000..65fb5fe2d4a3 --- /dev/null +++ b/ftp/pavuk/files/patch-src__ntlm_auth.c @@ -0,0 +1,35 @@ +--- src/ntlm_auth.c.orig 2005-10-27 16:06:37.000000000 +0200 ++++ src/ntlm_auth.c 2015-02-28 12:38:57.150120721 +0100 +@@ -249,14 +249,14 @@ + static void ntlm_des_enc(unsigned char *key, unsigned char *plaintext, + unsigned char *result) + { +- des_key_schedule ks; ++ DES_key_schedule ks; + #ifdef OPENSSL +- const_des_cblock _plaintext; ++ const_DES_cblock _plaintext; + #else + const des_cblock _plaintext; + #endif +- des_cblock _result; +- des_cblock key64; ++ DES_cblock _result; ++ DES_cblock key64; + unsigned char skey[8]; + + memcpy(&_plaintext, plaintext, sizeof(_plaintext)); +@@ -265,10 +265,10 @@ + memcpy(key64, skey, 8); + + #ifdef OPENSSL +- des_set_odd_parity(&key64); +- des_set_key(&key64, ks); ++ DES_set_odd_parity(&key64); ++ DES_set_key(&key64, &ks); + +- des_ecb_encrypt(&_plaintext, &_result, ks, DES_ENCRYPT); ++ DES_ecb_encrypt(&_plaintext, &_result, &ks, DES_ENCRYPT); + #else + des_set_odd_parity(key64); + des_set_key(key64, ks); |