From 0b6ac712e3883cbf07cc2bb16dc77d0f10493bb1 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 1 Jan 2015 14:28:00 +0000
Subject: Provide option types for binary AND, binary OR and silently
 discarding an option.

---
 src/usr.bin/openssl/apps.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/usr.bin/openssl/apps.h')

diff --git a/src/usr.bin/openssl/apps.h b/src/usr.bin/openssl/apps.h
index f0571480e2..dddfeeea7f 100644
--- a/src/usr.bin/openssl/apps.h
+++ b/src/usr.bin/openssl/apps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.h,v 1.12 2014/12/28 16:22:37 jsing Exp $ */
+/* $OpenBSD: apps.h,v 1.13 2015/01/01 14:28:00 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -290,10 +290,13 @@ struct option {
 		OPTION_ARG_FORMAT,
 		OPTION_ARG_FUNC,
 		OPTION_ARG_INT,
+		OPTION_DISCARD,
 		OPTION_FUNC,
 		OPTION_FLAG,
 		OPTION_FLAG_ORD,
 		OPTION_VALUE,
+		OPTION_VALUE_AND,
+		OPTION_VALUE_OR,
 	} type;
 	union {
 		char **arg;
-- 
cgit v1.2.3-55-g6feb