generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Print out GeneralizedTime and UTCTime in ASN1_STRING_print_ex().

Browse Source
This commit is contained in:
Dr. Stephen Henson 2003-11-10 01:25:11 +00:00
parent db5b10fab5
commit c22e6753ef
3 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
Changes between 0.9.7c and 0.9.7d [xx XXX XXXX] 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". *) Use the correct content when signing type "other".
[Steve Henson] [Steve Henson]

2
crypto/asn1/a_strex.c
View File

@ -285,7 +285,7 @@ const static signed char tag2nbyte[] = {
-1, -1, 0, -1, /* 10-13 */ -1, -1, 0, -1, /* 10-13 */
-1, -1, -1, -1, /* 15-17 */ -1, -1, -1, -1, /* 15-17 */
-1, 1, 1, /* 18-20 */ -1, 1, 1, /* 18-20 */
-1, 1, -1,-1, /* 21-24 */ -1, 1, 1, 1, /* 21-24 */
-1, 1, -1, /* 25-27 */ -1, 1, -1, /* 25-27 */
4, -1, 2 /* 28-30 */ 4, -1, 2 /* 28-30 */
}; };

33
crypto/pkcs7/pk7_doit.c
View File

@ -101,6 +101,39 @@ static ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7)
return NULL; 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) BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio)
{ {
int i; int i;