From 1997202bee0a7c4cd631a99cd43a4c761e839090 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 28 Aug 2014 13:37:41 +0000
Subject: Add option handling for input/output formats.

---
 src/usr.bin/openssl/apps.c | 7 ++++++-
 src/usr.bin/openssl/apps.h | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index fc5e2d073a..4ae6f12c18 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.3 2014/08/27 15:51:41 jsing Exp $ */
+/* $OpenBSD: apps.c,v 1.4 2014/08/28 13:37:41 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -2277,6 +2277,7 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed)
 				continue;
 
 			if (opt->type == OPTION_ARG ||
+			    opt->type == OPTION_ARG_FORMAT ||
 			    opt->type == OPTION_ARG_INT) {
 				if (++i >= argc) {
 					fprintf(stderr,
@@ -2291,6 +2292,10 @@ options_parse(int argc, char **argv, struct option *opts, char **unnamed)
 				*opt->opt.arg = argv[i];
 				break;
 
+			case OPTION_ARG_FORMAT:
+				*opt->opt.value = str2fmt(argv[i]);
+				break;
+
 			case OPTION_ARG_INT:
 				val = strtonum(argv[i], 0, INT_MAX, &errstr);
 				if (errstr != NULL) {
diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index 43d119500f..fefceb7ddb 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.3 2014/08/27 15:51:41 jsing Exp $ */
+/* $OpenBSD: apps.h,v 1.4 2014/08/28 13:37:41 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -288,6 +288,7 @@ struct option {
 	const char *desc;
 	enum {
 		OPTION_ARG,
+		OPTION_ARG_FORMAT,
 		OPTION_ARG_INT,
 		OPTION_FLAG,
 		OPTION_VALUE,
-- 
cgit v1.2.3-55-g6feb