| Index: openssl/apps/crl.c
 | 
| diff --git a/openssl/apps/crl.c b/openssl/apps/crl.c
 | 
| deleted file mode 100644
 | 
| index c395b2afd5d45c2461b4e9fa5cc94cf7483de10a..0000000000000000000000000000000000000000
 | 
| --- a/openssl/apps/crl.c
 | 
| +++ /dev/null
 | 
| @@ -1,446 +0,0 @@
 | 
| -/* apps/crl.c */
 | 
| -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 | 
| - * All rights reserved.
 | 
| - *
 | 
| - * This package is an SSL implementation written
 | 
| - * by Eric Young (eay@cryptsoft.com).
 | 
| - * The implementation was written so as to conform with Netscapes SSL.
 | 
| - * 
 | 
| - * This library is free for commercial and non-commercial use as long as
 | 
| - * the following conditions are aheared to.  The following conditions
 | 
| - * apply to all code found in this distribution, be it the RC4, RSA,
 | 
| - * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
 | 
| - * included with this distribution is covered by the same copyright terms
 | 
| - * except that the holder is Tim Hudson (tjh@cryptsoft.com).
 | 
| - * 
 | 
| - * Copyright remains Eric Young's, and as such any Copyright notices in
 | 
| - * the code are not to be removed.
 | 
| - * If this package is used in a product, Eric Young should be given attribution
 | 
| - * as the author of the parts of the library used.
 | 
| - * This can be in the form of a textual message at program startup or
 | 
| - * in documentation (online or textual) provided with the package.
 | 
| - * 
 | 
| - * Redistribution and use in source and binary forms, with or without
 | 
| - * modification, are permitted provided that the following conditions
 | 
| - * are met:
 | 
| - * 1. Redistributions of source code must retain the copyright
 | 
| - *    notice, this list of conditions and the following disclaimer.
 | 
| - * 2. Redistributions in binary form must reproduce the above copyright
 | 
| - *    notice, this list of conditions and the following disclaimer in the
 | 
| - *    documentation and/or other materials provided with the distribution.
 | 
| - * 3. All advertising materials mentioning features or use of this software
 | 
| - *    must display the following acknowledgement:
 | 
| - *    "This product includes cryptographic software written by
 | 
| - *     Eric Young (eay@cryptsoft.com)"
 | 
| - *    The word 'cryptographic' can be left out if the rouines from the library
 | 
| - *    being used are not cryptographic related :-).
 | 
| - * 4. If you include any Windows specific code (or a derivative thereof) from 
 | 
| - *    the apps directory (application code) you must include an acknowledgement:
 | 
| - *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
 | 
| - * 
 | 
| - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
 | 
| - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | 
| - * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 | 
| - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | 
| - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | 
| - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | 
| - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | 
| - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | 
| - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | 
| - * SUCH DAMAGE.
 | 
| - * 
 | 
| - * The licence and distribution terms for any publically available version or
 | 
| - * derivative of this code cannot be changed.  i.e. this code cannot simply be
 | 
| - * copied and put under another distribution licence
 | 
| - * [including the GNU Public Licence.]
 | 
| - */
 | 
| -
 | 
| -#include <stdio.h>
 | 
| -#include <stdlib.h>
 | 
| -#include <string.h>
 | 
| -#include "apps.h"
 | 
| -#include <openssl/bio.h>
 | 
| -#include <openssl/err.h>
 | 
| -#include <openssl/x509.h>
 | 
| -#include <openssl/x509v3.h>
 | 
| -#include <openssl/pem.h>
 | 
| -
 | 
| -#undef PROG
 | 
| -#define PROG	crl_main
 | 
| -
 | 
| -#undef POSTFIX
 | 
| -#define	POSTFIX	".rvk"
 | 
| -
 | 
| -static const char *crl_usage[]={
 | 
| -"usage: crl args\n",
 | 
| -"\n",
 | 
| -" -inform arg     - input format - default PEM (DER or PEM)\n",
 | 
| -" -outform arg    - output format - default PEM\n",
 | 
| -" -text           - print out a text format version\n",
 | 
| -" -in arg         - input file - default stdin\n",
 | 
| -" -out arg        - output file - default stdout\n",
 | 
| -" -hash           - print hash value\n",
 | 
| -" -fingerprint    - print the crl fingerprint\n",
 | 
| -" -issuer         - print issuer DN\n",
 | 
| -" -lastupdate     - lastUpdate field\n",
 | 
| -" -nextupdate     - nextUpdate field\n",
 | 
| -" -crlnumber      - print CRL number\n",
 | 
| -" -noout          - no CRL output\n",
 | 
| -" -CAfile  name   - verify CRL using certificates in file \"name\"\n",
 | 
| -" -CApath  dir    - verify CRL using certificates in \"dir\"\n",
 | 
| -" -nameopt arg    - various certificate name options\n",
 | 
| -NULL
 | 
| -};
 | 
| -
 | 
| -static X509_CRL *load_crl(char *file, int format);
 | 
| -static BIO *bio_out=NULL;
 | 
| -
 | 
| -int MAIN(int, char **);
 | 
| -
 | 
| -int MAIN(int argc, char **argv)
 | 
| -	{
 | 
| -	unsigned long nmflag = 0;
 | 
| -	X509_CRL *x=NULL;
 | 
| -	char *CAfile = NULL, *CApath = NULL;
 | 
| -	int ret=1,i,num,badops=0;
 | 
| -	BIO *out=NULL;
 | 
| -	int informat,outformat;
 | 
| -	char *infile=NULL,*outfile=NULL;
 | 
| -	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
 | 
| -	int fingerprint = 0, crlnumber = 0;
 | 
| -	const char **pp;
 | 
| -	X509_STORE *store = NULL;
 | 
| -	X509_STORE_CTX ctx;
 | 
| -	X509_LOOKUP *lookup = NULL;
 | 
| -	X509_OBJECT xobj;
 | 
| -	EVP_PKEY *pkey;
 | 
| -	int do_ver = 0;
 | 
| -	const EVP_MD *md_alg,*digest=EVP_sha1();
 | 
| -
 | 
| -	apps_startup();
 | 
| -
 | 
| -	if (bio_err == NULL)
 | 
| -		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 | 
| -			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 | 
| -
 | 
| -	if (!load_config(bio_err, NULL))
 | 
| -		goto end;
 | 
| -
 | 
| -	if (bio_out == NULL)
 | 
| -		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 | 
| -			{
 | 
| -			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
 | 
| -#ifdef OPENSSL_SYS_VMS
 | 
| -			{
 | 
| -			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
| -			bio_out = BIO_push(tmpbio, bio_out);
 | 
| -			}
 | 
| -#endif
 | 
| -			}
 | 
| -
 | 
| -	informat=FORMAT_PEM;
 | 
| -	outformat=FORMAT_PEM;
 | 
| -
 | 
| -	argc--;
 | 
| -	argv++;
 | 
| -	num=0;
 | 
| -	while (argc >= 1)
 | 
| -		{
 | 
| -#ifdef undef
 | 
| -		if	(strcmp(*argv,"-p") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			if (!args_from_file(++argv,Nargc,Nargv)) { goto end; }*/
 | 
| -			}
 | 
| -#endif
 | 
| -		if 	(strcmp(*argv,"-inform") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			informat=str2fmt(*(++argv));
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-outform") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			outformat=str2fmt(*(++argv));
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-in") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			infile= *(++argv);
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-out") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			outfile= *(++argv);
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-CApath") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			CApath = *(++argv);
 | 
| -			do_ver = 1;
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-CAfile") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			CAfile = *(++argv);
 | 
| -			do_ver = 1;
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-verify") == 0)
 | 
| -			do_ver = 1;
 | 
| -		else if (strcmp(*argv,"-text") == 0)
 | 
| -			text = 1;
 | 
| -		else if (strcmp(*argv,"-hash") == 0)
 | 
| -			hash= ++num;
 | 
| -		else if (strcmp(*argv,"-nameopt") == 0)
 | 
| -			{
 | 
| -			if (--argc < 1) goto bad;
 | 
| -			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
 | 
| -			}
 | 
| -		else if (strcmp(*argv,"-issuer") == 0)
 | 
| -			issuer= ++num;
 | 
| -		else if (strcmp(*argv,"-lastupdate") == 0)
 | 
| -			lastupdate= ++num;
 | 
| -		else if (strcmp(*argv,"-nextupdate") == 0)
 | 
| -			nextupdate= ++num;
 | 
| -		else if (strcmp(*argv,"-noout") == 0)
 | 
| -			noout= ++num;
 | 
| -		else if (strcmp(*argv,"-fingerprint") == 0)
 | 
| -			fingerprint= ++num;
 | 
| -		else if (strcmp(*argv,"-crlnumber") == 0)
 | 
| -			crlnumber= ++num;
 | 
| -		else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
 | 
| -			{
 | 
| -			/* ok */
 | 
| -			digest=md_alg;
 | 
| -			}
 | 
| -		else
 | 
| -			{
 | 
| -			BIO_printf(bio_err,"unknown option %s\n",*argv);
 | 
| -			badops=1;
 | 
| -			break;
 | 
| -			}
 | 
| -		argc--;
 | 
| -		argv++;
 | 
| -		}
 | 
| -
 | 
| -	if (badops)
 | 
| -		{
 | 
| -bad:
 | 
| -		for (pp=crl_usage; (*pp != NULL); pp++)
 | 
| -			BIO_printf(bio_err,"%s",*pp);
 | 
| -		goto end;
 | 
| -		}
 | 
| -
 | 
| -	ERR_load_crypto_strings();
 | 
| -	x=load_crl(infile,informat);
 | 
| -	if (x == NULL) { goto end; }
 | 
| -
 | 
| -	if(do_ver) {
 | 
| -		store = X509_STORE_new();
 | 
| -		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
 | 
| -		if (lookup == NULL) goto end;
 | 
| -		if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
 | 
| -			X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
 | 
| -			
 | 
| -		lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
 | 
| -		if (lookup == NULL) goto end;
 | 
| -		if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
 | 
| -			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
 | 
| -		ERR_clear_error();
 | 
| -
 | 
| -		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
 | 
| -			BIO_printf(bio_err,
 | 
| -				"Error initialising X509 store\n");
 | 
| -			goto end;
 | 
| -		}
 | 
| -
 | 
| -		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
 | 
| -					X509_CRL_get_issuer(x), &xobj);
 | 
| -		if(i <= 0) {
 | 
| -			BIO_printf(bio_err,
 | 
| -				"Error getting CRL issuer certificate\n");
 | 
| -			goto end;
 | 
| -		}
 | 
| -		pkey = X509_get_pubkey(xobj.data.x509);
 | 
| -		X509_OBJECT_free_contents(&xobj);
 | 
| -		if(!pkey) {
 | 
| -			BIO_printf(bio_err,
 | 
| -				"Error getting CRL issuer public key\n");
 | 
| -			goto end;
 | 
| -		}
 | 
| -		i = X509_CRL_verify(x, pkey);
 | 
| -		EVP_PKEY_free(pkey);
 | 
| -		if(i < 0) goto end;
 | 
| -		if(i == 0) BIO_printf(bio_err, "verify failure\n");
 | 
| -		else BIO_printf(bio_err, "verify OK\n");
 | 
| -	}
 | 
| -
 | 
| -	if (num)
 | 
| -		{
 | 
| -		for (i=1; i<=num; i++)
 | 
| -			{
 | 
| -			if (issuer == i)
 | 
| -				{
 | 
| -				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
 | 
| -				}
 | 
| -			if (crlnumber == i)
 | 
| -				{
 | 
| -				ASN1_INTEGER *crlnum;
 | 
| -				crlnum = X509_CRL_get_ext_d2i(x, NID_crl_number,
 | 
| -							      NULL, NULL);
 | 
| -				BIO_printf(bio_out,"crlNumber=");
 | 
| -				if (crlnum)
 | 
| -					{
 | 
| -					i2a_ASN1_INTEGER(bio_out, crlnum);
 | 
| -					ASN1_INTEGER_free(crlnum);
 | 
| -					}
 | 
| -				else
 | 
| -					BIO_puts(bio_out, "<NONE>");
 | 
| -				BIO_printf(bio_out,"\n");
 | 
| -				}
 | 
| -			if (hash == i)
 | 
| -				{
 | 
| -				BIO_printf(bio_out,"%08lx\n",
 | 
| -					X509_NAME_hash(X509_CRL_get_issuer(x)));
 | 
| -				}
 | 
| -			if (lastupdate == i)
 | 
| -				{
 | 
| -				BIO_printf(bio_out,"lastUpdate=");
 | 
| -				ASN1_TIME_print(bio_out,
 | 
| -						X509_CRL_get_lastUpdate(x));
 | 
| -				BIO_printf(bio_out,"\n");
 | 
| -				}
 | 
| -			if (nextupdate == i)
 | 
| -				{
 | 
| -				BIO_printf(bio_out,"nextUpdate=");
 | 
| -				if (X509_CRL_get_nextUpdate(x)) 
 | 
| -					ASN1_TIME_print(bio_out,
 | 
| -						X509_CRL_get_nextUpdate(x));
 | 
| -				else
 | 
| -					BIO_printf(bio_out,"NONE");
 | 
| -				BIO_printf(bio_out,"\n");
 | 
| -				}
 | 
| -			if (fingerprint == i)
 | 
| -				{
 | 
| -				int j;
 | 
| -				unsigned int n;
 | 
| -				unsigned char md[EVP_MAX_MD_SIZE];
 | 
| -
 | 
| -				if (!X509_CRL_digest(x,digest,md,&n))
 | 
| -					{
 | 
| -					BIO_printf(bio_err,"out of memory\n");
 | 
| -					goto end;
 | 
| -					}
 | 
| -				BIO_printf(bio_out,"%s Fingerprint=",
 | 
| -						OBJ_nid2sn(EVP_MD_type(digest)));
 | 
| -				for (j=0; j<(int)n; j++)
 | 
| -					{
 | 
| -					BIO_printf(bio_out,"%02X%c",md[j],
 | 
| -						(j+1 == (int)n)
 | 
| -						?'\n':':');
 | 
| -					}
 | 
| -				}
 | 
| -			}
 | 
| -		}
 | 
| -
 | 
| -	out=BIO_new(BIO_s_file());
 | 
| -	if (out == NULL)
 | 
| -		{
 | 
| -		ERR_print_errors(bio_err);
 | 
| -		goto end;
 | 
| -		}
 | 
| -
 | 
| -	if (outfile == NULL)
 | 
| -		{
 | 
| -		BIO_set_fp(out,stdout,BIO_NOCLOSE);
 | 
| -#ifdef OPENSSL_SYS_VMS
 | 
| -		{
 | 
| -		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 | 
| -		out = BIO_push(tmpbio, out);
 | 
| -		}
 | 
| -#endif
 | 
| -		}
 | 
| -	else
 | 
| -		{
 | 
| -		if (BIO_write_filename(out,outfile) <= 0)
 | 
| -			{
 | 
| -			perror(outfile);
 | 
| -			goto end;
 | 
| -			}
 | 
| -		}
 | 
| -
 | 
| -	if (text) X509_CRL_print(out, x);
 | 
| -
 | 
| -	if (noout) 
 | 
| -		{
 | 
| -		ret = 0;
 | 
| -		goto end;
 | 
| -		}
 | 
| -
 | 
| -	if 	(outformat == FORMAT_ASN1)
 | 
| -		i=(int)i2d_X509_CRL_bio(out,x);
 | 
| -	else if (outformat == FORMAT_PEM)
 | 
| -		i=PEM_write_bio_X509_CRL(out,x);
 | 
| -	else	
 | 
| -		{
 | 
| -		BIO_printf(bio_err,"bad output format specified for outfile\n");
 | 
| -		goto end;
 | 
| -		}
 | 
| -	if (!i) { BIO_printf(bio_err,"unable to write CRL\n"); goto end; }
 | 
| -	ret=0;
 | 
| -end:
 | 
| -	BIO_free_all(out);
 | 
| -	BIO_free_all(bio_out);
 | 
| -	bio_out=NULL;
 | 
| -	X509_CRL_free(x);
 | 
| -	if(store) {
 | 
| -		X509_STORE_CTX_cleanup(&ctx);
 | 
| -		X509_STORE_free(store);
 | 
| -	}
 | 
| -	apps_shutdown();
 | 
| -	OPENSSL_EXIT(ret);
 | 
| -	}
 | 
| -
 | 
| -static X509_CRL *load_crl(char *infile, int format)
 | 
| -	{
 | 
| -	X509_CRL *x=NULL;
 | 
| -	BIO *in=NULL;
 | 
| -
 | 
| -	in=BIO_new(BIO_s_file());
 | 
| -	if (in == NULL)
 | 
| -		{
 | 
| -		ERR_print_errors(bio_err);
 | 
| -		goto end;
 | 
| -		}
 | 
| -
 | 
| -	if (infile == NULL)
 | 
| -		BIO_set_fp(in,stdin,BIO_NOCLOSE);
 | 
| -	else
 | 
| -		{
 | 
| -		if (BIO_read_filename(in,infile) <= 0)
 | 
| -			{
 | 
| -			perror(infile);
 | 
| -			goto end;
 | 
| -			}
 | 
| -		}
 | 
| -	if 	(format == FORMAT_ASN1)
 | 
| -		x=d2i_X509_CRL_bio(in,NULL);
 | 
| -	else if (format == FORMAT_PEM)
 | 
| -		x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
 | 
| -	else	{
 | 
| -		BIO_printf(bio_err,"bad input format specified for input crl\n");
 | 
| -		goto end;
 | 
| -		}
 | 
| -	if (x == NULL)
 | 
| -		{
 | 
| -		BIO_printf(bio_err,"unable to load CRL\n");
 | 
| -		ERR_print_errors(bio_err);
 | 
| -		goto end;
 | 
| -		}
 | 
| -	
 | 
| -end:
 | 
| -	BIO_free(in);
 | 
| -	return(x);
 | 
| -	}
 | 
| -
 | 
| 
 |