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

Don't overwrite signing time.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-12-07 00:36:32 +00:00
parent a6977ee73d
commit f3e24baddf
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -12,6 +12,9 @@
*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7 *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
+) applies to 0.9.7 only +) applies to 0.9.7 only
*) Only add signing time to PKCS7 structures if it is not already present.
[Steve Henson]
*) Fix crypto/objects/objects.h: "ld-ce" should be "id-ce", *) Fix crypto/objects/objects.h: "ld-ce" should be "id-ce",
OBJ_ld_ce should be OBJ_id_ce. OBJ_ld_ce should be OBJ_id_ce.
Also some ip-pda OIDs in crypto/objects/objects.txt were Also some ip-pda OIDs in crypto/objects/objects.txt were

14
crypto/pkcs7/pk7_doit.c
View File

@ -557,11 +557,15 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
ASN1_UTCTIME *sign_time; ASN1_UTCTIME *sign_time;
const EVP_MD *md_tmp; const EVP_MD *md_tmp;
/* Add signing time */ /* Add signing time if not already present */
sign_time=X509_gmtime_adj(NULL,0); if (!PKCS7_get_signed_attribute(si,
PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime))
NID_pkcs9_signingTime, {
V_ASN1_UTCTIME,sign_time); sign_time=X509_gmtime_adj(NULL,0);
PKCS7_add_signed_attribute(si,
NID_pkcs9_signingTime,
V_ASN1_UTCTIME,sign_time);
}
/* Add digest */ /* Add digest */
md_tmp=EVP_MD_CTX_md(&ctx_tmp); md_tmp=EVP_MD_CTX_md(&ctx_tmp);