From: Richard Levitte <levitte@openssl.org>
Date: Fri, 9 Mar 2001 15:11:16 +0000 (+0000)
Subject: Uhmmm, how did those conflicts get through?
X-Git-Tag: OpenSSL-engine-0_9_6a-beta1~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c540bd28518328e7de9cf1b1af2d4b12e7c9e776;p=oweals%2Fopenssl.git

Uhmmm, how did those conflicts get through?
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 45d627a60a..e0898795ee 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -181,6 +181,7 @@ int MAIN(int argc, char **argv)
 	int prexit = 0;
 	SSL_METHOD *meth=NULL;
 	BIO *sbio;
+	char *inrand=NULL;
 	char *engine_id=NULL;
 	ENGINE *e=NULL;
 #ifdef WINDOWS
@@ -320,6 +321,11 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-nbio") == 0)
 			{ c_nbio=1; }
 #endif
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) goto bad;
+			inrand= *(++argv);
+			}
 		else if	(strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;
diff --git a/apps/s_server.c b/apps/s_server.c
index 61a77dff11..3a7c62350a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -415,6 +415,8 @@ int MAIN(int argc, char *argv[])
 	int no_tmp_rsa=0,no_dhe=0,nocert=0;
 	int state=0;
 	SSL_METHOD *meth=NULL;
+	char *inrand=NULL;
+	char *engine_id=NULL;
 	ENGINE *e=NULL;
 #ifndef NO_DH
 	DH *dh=NULL;
@@ -570,6 +572,11 @@ int MAIN(int argc, char *argv[])
 		else if	(strcmp(*argv,"-tls1") == 0)
 			{ meth=TLSv1_server_method(); }
 #endif
+		else if (strcmp(*argv,"-rand") == 0)
+			{
+			if (--argc < 1) goto bad;
+			inrand= *(++argv);
+			}
 		else if (strcmp(*argv,"-engine") == 0)
 			{
 			if (--argc < 1) goto bad;