head	1.4;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3
	OPENPKG_E1_FP:1.3
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3
	OPENPKG_2_STABLE_20060622:1.3
	OPENPKG_2_STABLE:1.3.0.14
	OPENPKG_2_STABLE_BP:1.3
	OPENPKG_2_5_RELEASE:1.3
	OPENPKG_2_5_SOLID:1.3.0.12
	OPENPKG_2_5_SOLID_BP:1.3
	OPENPKG_2_4_RELEASE:1.3
	OPENPKG_2_4_SOLID:1.3.0.10
	OPENPKG_2_4_SOLID_BP:1.3
	OPENPKG_CW_FP:1.3
	OPENPKG_2_3_RELEASE:1.3
	OPENPKG_2_3_SOLID:1.3.0.8
	OPENPKG_2_3_SOLID_BP:1.3
	OPENPKG_2_2_RELEASE:1.3
	OPENPKG_2_2_SOLID:1.3.0.6
	OPENPKG_2_2_SOLID_BP:1.3
	OPENPKG_2_1_RELEASE:1.3
	OPENPKG_2_1_SOLID:1.3.0.4
	OPENPKG_2_1_SOLID_BP:1.3
	OPENPKG_2_0_RELEASE:1.3
	OPENPKG_2_0_SOLID:1.3.0.2
	OPENPKG_2_0_SOLID_BP:1.3
	OPENPKG_1_3_RELEASE:1.1.2.1
	OPENPKG_1_3_SOLID:1.1.2.1.0.2
	OPENPKG_1_3_SOLID_BP:1.1.2.1
	OPENPKG_1_STABLE_MP:1.3
	OPENPKG_1_2_RELEASE:1.1
	OPENPKG_1_2_SOLID:1.1.0.4
	OPENPKG_1_2_SOLID_BP:1.1
	OPENPKG_1_STABLE:1.1.0.2
	OPENPKG_1_STABLE_BP:1.1;
locks; strict;
comment	@# @;


1.4
date	2008.05.11.21.32.23;	author rse;	state dead;
branches;
next	1.3;
commitid	uLXy8q2ZDgkPOA2t;

1.3
date	2003.01.31.10.42.59;	author mlelstv;	state Exp;
branches;
next	1.2;

1.2
date	2003.01.31.09.13.47;	author mlelstv;	state dead;
branches;
next	1.1;

1.1
date	2002.12.31.11.11.50;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2003.07.24.20.50.28;	author rse;	state Exp;
branches;
next	;


desc
@@


1.4
log
@upgrading package: rdesktop 1.5.0 -> 1.6.0
@
text
@--- tcp.c.dist	Fri Jan 31 11:35:49 2003
+++ tcp.c	Fri Jan 31 11:38:48 2003
@@@@ -26,6 +26,13 @@@@
 #include <netinet/tcp.h>	/* TCP_NODELAY */
 #include <arpa/inet.h>		/* inet_addr */
 #include <errno.h>		/* errno */
+
+#ifdef __svr4__
+#ifndef INADDR_NONE
+#define INADDR_NONE   (-1)
+#endif
+#endif
+
 #include "rdesktop.h"
 
 static int sock;
@


1.3
log
@Provide patch for Solaris
@
text
@@


1.2
log
@upgrade from 1.1.0 to 1.2.0
@
text
@d1 13
a13 4
--- secure.c.orig	2002-12-31 11:58:07.000000000 +0100
+++ secure.c	2002-12-31 11:59:03.000000000 +0100
@@@@ -20,10 +20,10 @@@@
 
d16 1
a16 48
-#include <rc4.h>
-#include <md5.h>
-#include <sha.h>
-#include <bn.h>
+#include "openssl/rc4.h"
+#include "openssl/md5.h"
+#include "openssl/sha.h"
+#include "openssl/bn.h"
 
 extern char *hostname;
 extern int width;
@@@@ -280,7 +280,7 @@@@
 sec_rsa_encrypt(uint8 *out, uint8 *in, int len,
 		uint8 *modulus, uint8 *exponent)
 {
-	BN_CTX ctx;
+	BN_CTX *ctx;
 	BIGNUM mod, exp, x, y;
 	uint8 inr[SEC_MODULUS_SIZE];
 	int outlen;
@@@@ -290,7 +290,8 @@@@
 	memcpy(inr, in, len);
 	reverse(inr, len);
 
-	BN_CTX_init(&ctx);
+	ctx = BN_CTX_new();
+	BN_CTX_init(ctx);
 	BN_init(&mod);
 	BN_init(&exp);
 	BN_init(&x);
@@@@ -299,7 +300,7 @@@@
 	BN_bin2bn(modulus, SEC_MODULUS_SIZE, &mod);
 	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
 	BN_bin2bn(inr, len, &x);
-	BN_mod_exp(&y, &x, &exp, &mod, &ctx);
+	BN_mod_exp(&y, &x, &exp, &mod, ctx);
 	outlen = BN_bn2bin(&y, out);
 	reverse(out, outlen);
 	if (outlen < SEC_MODULUS_SIZE)
@@@@ -309,7 +310,7 @@@@
 	BN_clear_free(&x);
 	BN_free(&exp);
 	BN_free(&mod);
-	BN_CTX_free(&ctx);
+	BN_CTX_free(ctx);
 }
 
 
@


1.1
log
@fix building under new OpenSSL 0.9.7 world order
@
text
@@


1.1.2.1
log
@mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only]
@
text
@d1 4
a4 13
--- tcp.c.dist	Fri Jan 31 11:35:49 2003
+++ tcp.c	Fri Jan 31 11:38:48 2003
@@@@ -26,6 +26,13 @@@@
 #include <netinet/tcp.h>	/* TCP_NODELAY */
 #include <arpa/inet.h>		/* inet_addr */
 #include <errno.h>		/* errno */
+
+#ifdef __svr4__
+#ifndef INADDR_NONE
+#define INADDR_NONE   (-1)
+#endif
+#endif
+
d7 48
a54 1
 static int sock;
@