From 3f7c59208270dd4f8acb52649a5e6d349d21859b Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 14 Jul 2009 15:30:05 +0000 Subject: [PATCH] Updates from 1.0.0-stable. --- apps/x509.c | 4 ++-- ssl/s3_pkt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/x509.c b/apps/x509.c index af534f63d1..f4198d97be 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -626,7 +626,7 @@ bad: if (!X509_set_subject_name(x,req->req_info->subject)) goto end; 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); X509_set_pubkey(x,pkey); @@ -1147,7 +1147,7 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest, goto end; /* 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; if (clrext) diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 928755c82a..febc2860e1 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -208,7 +208,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) 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); return -1; @@ -221,7 +221,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) { if (max < n) max = n; - if (max > rb->len - rb->offset) + if (max > (int)(rb->len - rb->offset)) max = rb->len - rb->offset; } -- 2.34.1