===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/openssl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/openssl/openssl.c	2022/11/11 17:07:39	1.31
--- src/usr.bin/openssl/openssl.c	2022/11/11 18:24:32	1.32
***************
*** 1,4 ****
! /* $OpenBSD: openssl.c,v 1.31 2022/11/11 17:07:39 joshua Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: openssl.c,v 1.32 2022/11/11 18:24:32 joshua Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 497,506 ****
  	FUNCTION f, *fp;
  	int ret = 1;
  
! 	if ((argc <= 0) || (argv[0] == NULL)) {
! 		ret = 0;
! 		goto end;
! 	}
  	f.name = argv[0];
  	fp = lh_FUNCTION_retrieve(prog, &f);
  	if (fp == NULL) {
--- 497,505 ----
  	FUNCTION f, *fp;
  	int ret = 1;
  
! 	if (argc <= 0 || argv[0] == NULL)
! 		return 0;
! 
  	f.name = argv[0];
  	fp = lh_FUNCTION_retrieve(prog, &f);
  	if (fp == NULL) {
***************
*** 514,522 ****
  			fp = &f;
  		}
  	}
! 	if (fp != NULL) {
! 		ret = fp->func(argc, argv);
! 	} else if ((strncmp(argv[0], "no-", 3)) == 0) {
  		BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
  		f.name = argv[0] + 3;
  		ret = (lh_FUNCTION_retrieve(prog, &f) != NULL);
--- 513,528 ----
  			fp = &f;
  		}
  	}
! 
! 	if (fp != NULL)
! 		return fp->func(argc, argv);
! 
! 	if (strcmp(argv[0], "help") == 0) {
! 		print_help();
! 		return 0;
! 	}
! 
! 	if ((strncmp(argv[0], "no-", 3)) == 0) {
  		BIO *bio_stdout = BIO_new_fp(stdout, BIO_NOCLOSE);
  		f.name = argv[0] + 3;
  		ret = (lh_FUNCTION_retrieve(prog, &f) != NULL);
***************
*** 525,532 ****
  		else
  			BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
  		BIO_free_all(bio_stdout);
! 		goto end;
! 	} else if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
  	    (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
  	    (strcmp(argv[0], LIST_MESSAGE_DIGEST_ALGORITHMS) == 0) ||
  	    (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0) ||
--- 531,540 ----
  		else
  			BIO_printf(bio_stdout, "%s\n", argv[0] + 3);
  		BIO_free_all(bio_stdout);
! 		return ret;
! 	}
! 
! 	if ((strcmp(argv[0], LIST_STANDARD_COMMANDS) == 0) ||
  	    (strcmp(argv[0], LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
  	    (strcmp(argv[0], LIST_MESSAGE_DIGEST_ALGORITHMS) == 0) ||
  	    (strcmp(argv[0], LIST_CIPHER_COMMANDS) == 0) ||
***************
*** 562,578 ****
  					    fp->name);
  		}
  		BIO_free_all(bio_stdout);
! 		ret = 0;
! 		goto end;
! 	} else {
! 		BIO_printf(bio_err,
! 		    "openssl:Error: '%s' is an invalid command.\n",
! 		    argv[0]);
! 		print_help();
! 		ret = 0;
  	}
!  end:
! 	return (ret);
  }
  
  static void
--- 570,584 ----
  					    fp->name);
  		}
  		BIO_free_all(bio_stdout);
! 		return 0;
  	}
! 
! 	BIO_printf(bio_err,
! 	    "openssl:Error: '%s' is an invalid command.\n",
! 	    argv[0]);
! 	print_help();
! 
! 	return 1;
  }
  
  static void