Commit 50522642 authored by Tim Hudson's avatar Tim Hudson Committed by Dr. Stephen Henson
Browse files

Add option to generate old hash format. 

New -hash_old to generate CRL hashes using old
(before OpenSSL 1.0.0) algorithm.
(cherry picked from commit de2d97cd)
parent bfc3424d

apps/crl.c

+18 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,9 @@ static const char *crl_usage[]={ 
" -in arg         - input file - default stdin\n",

" -in arg         - input file - default stdin\n",

" -out arg        - output file - default stdout\n",

" -out arg        - output file - default stdout\n",

" -hash           - print hash value\n",

" -hash           - print hash value\n",

#ifndef OPENSSL_NO_MD5

" -hash_old       - print old-style (MD5) hash value\n",

#endif

" -fingerprint    - print the crl fingerprint\n",

" -fingerprint    - print the crl fingerprint\n",

" -issuer         - print issuer DN\n",

" -issuer         - print issuer DN\n",

" -lastupdate     - lastUpdate field\n",

" -lastupdate     - lastUpdate field\n",
@@ -108,6 +111,9 @@ int MAIN(int argc, char **argv) 
	int informat,outformat;

	int informat,outformat;

	char *infile=NULL,*outfile=NULL;

	char *infile=NULL,*outfile=NULL;

	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;

	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;

#ifndef OPENSSL_NO_MD5

       int hash_old=0;

#endif

	int fingerprint = 0, crlnumber = 0;

	int fingerprint = 0, crlnumber = 0;

	const char **pp;

	const char **pp;

	X509_STORE *store = NULL;

	X509_STORE *store = NULL;
@@ -192,6 +198,10 @@ int MAIN(int argc, char **argv) 
			text = 1;

			text = 1;

		else if (strcmp(*argv,"-hash") == 0)

		else if (strcmp(*argv,"-hash") == 0)

			hash= ++num;

			hash= ++num;

#ifndef OPENSSL_NO_MD5

		else if (strcmp(*argv,"-hash_old") == 0)

			hash_old= ++num;

#endif

		else if (strcmp(*argv,"-nameopt") == 0)

		else if (strcmp(*argv,"-nameopt") == 0)

			{

			{

			if (--argc < 1) goto bad;

			if (--argc < 1) goto bad;
@@ -304,6 +314,14 @@ bad: 
				BIO_printf(bio_out,"%08lx\n",

				BIO_printf(bio_out,"%08lx\n",

					X509_NAME_hash(X509_CRL_get_issuer(x)));

					X509_NAME_hash(X509_CRL_get_issuer(x)));

				}

				}

#ifndef OPENSSL_NO_MD5

			if (hash_old == i)

				{

				BIO_printf(bio_out,"%08lx\n",

					X509_NAME_hash_old(

						X509_CRL_get_issuer(x)));

				}

#endif

			if (lastupdate == i)

			if (lastupdate == i)

				{

				{

				BIO_printf(bio_out,"lastUpdate=");

				BIO_printf(bio_out,"lastUpdate=");