import openssl-0.9.7d

2 files changed, 10 insertions, 8 deletions

diff --git a/src/lib/libcrypto/asn1/a_gentm.c b/src/lib/libcrypto/asn1/a_gentm.c
index cd09f68b38..8581007868 100644
--- a/src/lib/libcrypto/asn1/a_gentm.c
+++ b/src/lib/libcrypto/asn1/a_gentm.c
@@ -208,6 +208,7 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
         char *p;
         struct tm *ts;
         struct tm data;
+        size_t len = 20; 
 
         if (s == NULL)
                 s=M_ASN1_GENERALIZEDTIME_new();
@@ -219,17 +220,17 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
                 return(NULL);
 
         p=(char *)s->data;
-        if ((p == NULL) || (s->length < 16))
+        if ((p == NULL) || ((size_t)s->length < len))
                 {
-                p=OPENSSL_malloc(20);
+                p=OPENSSL_malloc(len);
                 if (p == NULL) return(NULL);
                 if (s->data != NULL)
                         OPENSSL_free(s->data);
                 s->data=(unsigned char *)p;
                 }
 
-        sprintf(p,"%04d%02d%02d%02d%02d%02dZ",ts->tm_year + 1900,
-                ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
+        BIO_snprintf(p,len,"%04d%02d%02d%02d%02d%02dZ",ts->tm_year + 1900,
+                     ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
         s->length=strlen(p);
         s->type=V_ASN1_GENERALIZEDTIME;
 #ifdef CHARSET_EBCDIC_not
diff --git a/src/lib/libcrypto/asn1/a_utctm.c b/src/lib/libcrypto/asn1/a_utctm.c
index dbb4a42c9d..999852dae5 100644
--- a/src/lib/libcrypto/asn1/a_utctm.c
+++ b/src/lib/libcrypto/asn1/a_utctm.c
@@ -188,6 +188,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
         char *p;
         struct tm *ts;
         struct tm data;
+        size_t len = 20;
 
         if (s == NULL)
                 s=M_ASN1_UTCTIME_new();
@@ -199,17 +200,17 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
                 return(NULL);
 
         p=(char *)s->data;
-        if ((p == NULL) || (s->length < 14))
+        if ((p == NULL) || ((size_t)s->length < len))
                 {
-                p=OPENSSL_malloc(20);
+                p=OPENSSL_malloc(len);
                 if (p == NULL) return(NULL);
                 if (s->data != NULL)
                         OPENSSL_free(s->data);
                 s->data=(unsigned char *)p;
                 }
 
-        sprintf(p,"%02d%02d%02d%02d%02d%02dZ",ts->tm_year%100,
-                ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
+        BIO_snprintf(p,len,"%02d%02d%02d%02d%02d%02dZ",ts->tm_year%100,
+                     ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
         s->length=strlen(p);
         s->type=V_ASN1_UTCTIME;
 #ifdef CHARSET_EBCDIC_not