OpenSSL: openssl/apps/ cms.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
24-Mar-2008 22:53:07
  Branch: HEAD                             Handle:
2008032421530700

  Modified files:
    openssl/apps            cms.c

  Log:
    Add support for CMS structure printing in cms utility.

  Summary:
    Revision    Changes     Path
    1.12        +14 -2      openssl/apps/cms.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/apps/cms.c
 
============================================================
================
  $ cvs diff -u -r1.11 -r1.12 cms.c
  --- openssl/apps/cms.c	19 Mar 2008 19:34:29 -0000	1.11
  +++ openssl/apps/cms.c	24 Mar 2008 21:53:07 -0000	1.12
   -110,7 +110,7 
   	STACK_OF(X509) *encerts = NULL, *other = NULL;
   	BIO *in = NULL, *out = NULL, *indata = NULL;
   	int badarg = 0;
  -	int flags = CMS_DETACHED;
  +	int flags = CMS_DETACHED, noout = 0, print = 0;
   	char *to = NULL, *from = NULL, *subject = NULL;
   	char *CAfile = NULL, *CApath = NULL;
   	char *passargin = NULL, *passin = NULL;
   -242,6 +242,13 
   				flags |= CMS_NOOLDMIMETYPE;
   		else if (!strcmp (*args, "-crlfeol"))
   				flags |= CMS_CRLFEOL;
  +		else if (!strcmp (*args, "-noout"))
  +				noout = 1;
  +		else if (!strcmp (*args, "-print"))
  +				{
  +				noout = 1;
  +				print = 1;
  +				}
   		else if (!strcmp(*args,"-secretkey"))
   			{
   			long ltmp;
   -935,7 +942,12 
   		}
   	else
   		{
  -		if (outformat == FORMAT_SMIME) 
  +		if (noout)
  +			{
  +			if (print)
  +				CMS_ContentInfo_print_ctx(out, cms, 0, NULL);
  +			}
  +		else if (outformat == FORMAT_SMIME)
   			{
   			if (to)
   				BIO_printf(out, "To: %sn", to);
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org