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

Updates from 1.0.0-stable.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-07-14 15:30:05 +00:00
parent 0e4bc56347
commit 3f7c592082
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/x509.c
View File

@ -626,7 +626,7 @@ bad:
if (!X509_set_subject_name(x,req->req_info->subject)) goto end; if (!X509_set_subject_name(x,req->req_info->subject)) goto end;
X509_gmtime_adj(X509_get_notBefore(x),0); X509_gmtime_adj(X509_get_notBefore(x),0);
X509_gmtime_adj_ex(X509_get_notAfter(x),days, 0, NULL); X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL);
pkey = X509_REQ_get_pubkey(req); pkey = X509_REQ_get_pubkey(req);
X509_set_pubkey(x,pkey); X509_set_pubkey(x,pkey);
@ -1147,7 +1147,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
goto end; goto end;
/* hardwired expired */ /* hardwired expired */
if (X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days) == NULL) if (X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL) == NULL)
goto end; goto end;
if (clrext) if (clrext)

4
ssl/s3_pkt.c
View File

@ -208,7 +208,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
rb->offset = len + align; rb->offset = len + align;
} }
if (n > rb->len - rb->offset) /* does not happen */ if (n > (int)(rb->len - rb->offset)) /* does not happen */
{ {
SSLerr(SSL_F_SSL3_READ_N,ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_READ_N,ERR_R_INTERNAL_ERROR);
return -1; return -1;
@ -221,7 +221,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
{ {
if (max < n) if (max < n)
max = n; max = n;
if (max > rb->len - rb->offset) if (max > (int)(rb->len - rb->offset))
max = rb->len - rb->offset; max = rb->len - rb->offset;
} }