diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2004-12-05 01:03:15 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2004-12-05 01:03:15 +0000 |
| commit | a0e7c8eede26b29b09057f48b8e51f46f8811ddd (patch) | |
| tree | 2b50575b4e9e608b61cb74246915625bd99b85d8 /crypto/x509 | |
| parent | a8e00b17ce840c58787e45411fa2ac4d6b1fb10c (diff) | |
Add lots of checks for memory allocation failure, error codes to indicate
failure and freeing up memory if a failure occurs.
PR:620
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_r2x.c | 6 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c index db051033d9..fb8a78dabe 100644 --- a/crypto/x509/x509_r2x.c +++ b/crypto/x509/x509_r2x.c @@ -92,8 +92,10 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey) X509_set_subject_name(ret,X509_NAME_dup(xn)); X509_set_issuer_name(ret,X509_NAME_dup(xn)); - X509_gmtime_adj(xi->validity->notBefore,0); - X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days); + if (X509_gmtime_adj(xi->validity->notBefore,0) == NULL) + goto err; + if (X509_gmtime_adj(xi->validity->notAfter,(long)60*60*24*days) == NULL) + goto err; X509_set_pubkey(ret,X509_REQ_get_pubkey(r)); diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index 5e2cc82c51..c6c83ad72f 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -1054,7 +1054,8 @@ int X509_cmp_time(ASN1_TIME *ctm, time_t *cmp_time) atm.length=sizeof(buff2); atm.data=(unsigned char *)buff2; - X509_time_adj(&atm,-offset*60, cmp_time); + if (X509_time_adj(&atm,-offset*60, cmp_time) == NULL) + return 0; if (ctm->type == V_ASN1_UTCTIME) { |