Commit c540bd28 authored by Richard Levitte's avatar Richard Levitte
Browse files

Uhmmm, how did those conflicts get through?

parent 6ad07762

apps/s_client.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

apps/s_server.c

+7 −0
Original line number Diff line number Diff line
@@ -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;