===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/apps.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/openssl/apps.h	2014/12/28 16:22:37	1.12
--- src/usr.bin/openssl/apps.h	2015/01/01 14:28:00	1.13
***************
*** 1,4 ****
! /* $OpenBSD: apps.h,v 1.12 2014/12/28 16:22:37 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $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,299 ****
--- 290,302 ----
  		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;