Date: Mon, 12 Sep 2016 16:10:41 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421934 - in head/net/ssltunnel-client: . files Message-ID: <201609121610.u8CGAfXu088855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 16:10:41 2016 New Revision: 421934 URL: https://svnweb.freebsd.org/changeset/ports/421934 Log: net/ssltunnel-client: Configure SSL base, handle deprecated DES (LIbreSSL) Approved by: SSL blanket Added: head/net/ssltunnel-client/files/ head/net/ssltunnel-client/files/patch-client_ntlmauth.c (contents, props changed) Modified: head/net/ssltunnel-client/Makefile Modified: head/net/ssltunnel-client/Makefile ============================================================================== --- head/net/ssltunnel-client/Makefile Mon Sep 12 16:02:19 2016 (r421933) +++ head/net/ssltunnel-client/Makefile Mon Sep 12 16:10:41 2016 (r421934) @@ -16,10 +16,11 @@ LICENSE= BSD3CLAUSE OPTIONS_DEFINE= GUI DOCS GUI_DESC= GTK 1.2 graphical interface -CONFIGURE_ARGS= --disable-server --with-iconv=${ICONV_PREFIX} +CONFIGURE_ARGS= --disable-server \ + --with-iconv=${ICONV_PREFIX} \ + --with-openssl=${OPENSSLBASE} GNU_CONFIGURE= yes -USES= iconv -USE_OPENSSL= yes +USES= iconv ssl .include <bsd.port.options.mk> Added: head/net/ssltunnel-client/files/patch-client_ntlmauth.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ssltunnel-client/files/patch-client_ntlmauth.c Mon Sep 12 16:10:41 2016 (r421934) @@ -0,0 +1,43 @@ +--- client/ntlmauth.c.orig 2009-02-05 15:32:12 UTC ++++ client/ntlmauth.c +@@ -56,7 +56,7 @@ extern int write_timeout(int s, char *b + extern int read_timeout(int s, char *buffer, int size, int tmo); + extern void do_log( int prio, char *format , ...); + +-static void setup_des_key(unsigned char *key56, des_key_schedule *ks); ++static void setup_des_key(unsigned char *key56, DES_key_schedule *ks); + static void calc_resp(unsigned char *keys, unsigned char *plaintext, unsigned char *results); + static char *do_ntlm_auth_1(char *username, char *password); + static char *do_ntlm_auth_2(iconv_t myiconv, char *username, char *password, char *challenge); +@@ -156,8 +156,8 @@ static char *do_ntlm_auth_2(iconv_t myic + unsigned char *nt_pw = NULL,*lm_resp,*nt_resp; + const unsigned char magic[] = "KGS!@#$%"; + unsigned char lm_hpw[50]; +- des_key_schedule ks1; +- des_key_schedule ks2; ++ DES_key_schedule ks1; ++ DES_key_schedule ks2; + unsigned char nt_hpw[50]; + MD4_CTX context; + unsigned short server_flags; +@@ -558,9 +558,9 @@ catch: + * turns a 56 bit key into the 64 bit, odd parity key and sets the key. + * The key schedule ks is also set. + */ +-static void setup_des_key(unsigned char key_56[], des_key_schedule *ks) ++static void setup_des_key(unsigned char key_56[], DES_key_schedule *ks) + { +- des_cblock key; ++ DES_cblock key; + + key[0] = key_56[0]; + key[1] = ((key_56[0] << 7) & 0xFF) | (key_56[1] >> 1); +@@ -582,7 +582,7 @@ static void setup_des_key(unsigned char + */ + static void calc_resp(unsigned char *keys, unsigned char *plaintext, unsigned char *results) + { +- des_key_schedule ks; ++ DES_key_schedule ks; + + setup_des_key(keys, &ks); + DES_ecb_encrypt((const_DES_cblock *) plaintext, (const_DES_cblock *) results, &ks, DES_ENCRYPT);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609121610.u8CGAfXu088855>