diff --git a/lib/asn1/der.h b/lib/asn1/der.h
index acb27ebbc..65579a5f9 100644
--- a/lib/asn1/der.h
+++ b/lib/asn1/der.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -66,7 +66,7 @@ enum {
 time_t timegm (struct tm *);
 #endif
 
-void time2generalizedtime (time_t t, octet_string *s);
+int time2generalizedtime (time_t t, octet_string *s);
 
 int der_get_int (const unsigned char *p, size_t len, int *ret, size_t *size);
 int der_get_length (const unsigned char *p, size_t len,
diff --git a/lib/asn1/der_put.c b/lib/asn1/der_put.c
index 5776ddabd..68bba4995 100644
--- a/lib/asn1/der_put.c
+++ b/lib/asn1/der_put.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -293,17 +293,20 @@ encode_octet_string (unsigned char *p, size_t len,
     return 0;
 }
 
-void
+int
 time2generalizedtime (time_t t, octet_string *s)
 {
      struct tm *tm;
 
      s->data = malloc(16);
+     if (s->data == NULL)
+	 return ENOMEM;
      s->length = 15;
      tm = gmtime (&t);
      sprintf (s->data, "%04d%02d%02d%02d%02d%02dZ", tm->tm_year + 1900,
 	      tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min,
 	      tm->tm_sec);
+     return 0;
 }
 
 int
@@ -315,7 +318,9 @@ encode_generalized_time (unsigned char *p, size_t len,
     octet_string k;
     int e;
 
-    time2generalizedtime (*t, &k);
+    e = time2generalizedtime (*t, &k);
+    if (e)
+	return e;
     e = der_put_octet_string (p, len, &k, &l);
     free (k.data);
     if (e)