Commit c22e6753 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex().

parent db5b10fa

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.7c and 0.9.7d  [xx XXX XXXX]



  *) Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex().

     [Peter Sylvester <Peter.Sylvester@EdelWeb.fr>]



  *) Use the correct content when signing type "other".

     [Steve Henson]

crypto/asn1/a_strex.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ const static signed char tag2nbyte[] = { 
	-1, -1, 0, -1,		/* 10-13 */

	-1, -1, -1, -1,		/* 15-17 */

	-1, 1, 1,		/* 18-20 */

	-1, 1, -1,-1,		/* 21-24 */

	-1, 1, 1, 1,		/* 21-24 */

	-1, 1, -1,		/* 25-27 */

	4, -1, 2		/* 28-30 */

};

crypto/pkcs7/pk7_doit.c

+33 −0
Original line number Diff line number Diff line
@@ -101,6 +101,39 @@ static ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7) 
	return NULL;

	}



static int PKCS7_bio_add_digest(BIO **pbio, X509_ALGOR *alg)

	{

	BIO *btmp;

	EVP_MD *md;

	if ((btmp=BIO_new(BIO_f_md())) == NULL)

		{

		PKCS7err(PKCS7_F_PKCS7_DATAINIT,ERR_R_BIO_LIB);

		goto err;

		}



	md=EVP_get_digestbyobj(xa->algorithm);

	if (md == NULL)

		{

		PKCS7err(PKCS7_F_PKCS7_DATAINIT,PKCS7_R_UNKNOWN_DIGEST_TYPE);

		goto err;

		}



	BIO_set_md(btmp,evp_md);

	if (*pout == NULL)

		*pout=btmp;

	else

		BIO_push(*pout,btmp);

	btmp=NULL;



	return 1;



	err:

	if (btmp)

		BIO_free(btmp);

	return 0;



	}



BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)

	{

	int i;