Commit 6b6fe3d8 authored Apr 17, 2008 by Lutz Jänicke

Correctly handle case of bad arguments supplied to rsautl

PR: 1659

parent 4c1a6e00

apps/rsautl.c

+24 −12

Original line number	Original line	Diff line number	Diff line
	@@ -119,23 +119,35 @@ int MAIN(int argc, char **argv)
	while(argc >= 1)		while(argc >= 1)
	{		{
	if (!strcmp(*argv,"-in")) {		if (!strcmp(*argv,"-in")) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	infile= *(++argv);		infile= *(++argv);
	} else if (!strcmp(*argv,"-out")) {		} else if (!strcmp(*argv,"-out")) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	outfile= *(++argv);		outfile= *(++argv);
	} else if(!strcmp(*argv, "-inkey")) {		} else if(!strcmp(*argv, "-inkey")) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	keyfile = *(++argv);		keyfile = *(++argv);
	} else if (!strcmp(*argv,"-passin")) {		} else if (!strcmp(*argv,"-passin")) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	passargin= *(++argv);		passargin= *(++argv);
	} else if (strcmp(*argv,"-keyform") == 0) {		} else if (strcmp(*argv,"-keyform") == 0) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	keyform=str2fmt(*(++argv));		keyform=str2fmt(*(++argv));
	#ifndef OPENSSL_NO_ENGINE		#ifndef OPENSSL_NO_ENGINE
	} else if(!strcmp(*argv, "-engine")) {		} else if(!strcmp(*argv, "-engine")) {
	if (--argc < 1) badarg = 1;		if (--argc < 1)
			badarg = 1;
			else
	engine = *(++argv);		engine = *(++argv);
	#endif		#endif
	} else if(!strcmp(*argv, "-pubin")) {		} else if(!strcmp(*argv, "-pubin")) {