From c22e6753ef9f7621ca6833c58b0a0be37969b91b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 10 Nov 2003 01:25:11 +0000 Subject: [PATCH] Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex(). --- CHANGES | 3 +++ crypto/asn1/a_strex.c | 2 +- crypto/pkcs7/pk7_doit.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 0d8d08cd80..9504c46e7e 100644 --- a/CHANGES +++ b/CHANGES @@ -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 ] + *) Use the correct content when signing type "other". [Steve Henson] diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 8abfdfe598..bde666a6ff 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -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 */ }; diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 35c7dcd0b3..64404b0630 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -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; -- 2.25.1