mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Don't overwrite signing time.
This commit is contained in:
parent
a6977ee73d
commit
f3e24baddf
3
CHANGES
3
CHANGES
@ -12,6 +12,9 @@
|
||||
*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
|
||||
+) 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",
|
||||
OBJ_ld_ce should be OBJ_id_ce.
|
||||
Also some ip-pda OIDs in crypto/objects/objects.txt were
|
||||
|
@ -557,11 +557,15 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
|
||||
ASN1_UTCTIME *sign_time;
|
||||
const EVP_MD *md_tmp;
|
||||
|
||||
/* Add signing time */
|
||||
sign_time=X509_gmtime_adj(NULL,0);
|
||||
PKCS7_add_signed_attribute(si,
|
||||
NID_pkcs9_signingTime,
|
||||
V_ASN1_UTCTIME,sign_time);
|
||||
/* Add signing time if not already present */
|
||||
if (!PKCS7_get_signed_attribute(si,
|
||||
NID_pkcs9_signingTime))
|
||||
{
|
||||
sign_time=X509_gmtime_adj(NULL,0);
|
||||
PKCS7_add_signed_attribute(si,
|
||||
NID_pkcs9_signingTime,
|
||||
V_ASN1_UTCTIME,sign_time);
|
||||
}
|
||||
|
||||
/* Add digest */
|
||||
md_tmp=EVP_MD_CTX_md(&ctx_tmp);
|
||||
|
Loading…
Reference in New Issue
Block a user