commit 9c208aabc83262515aa4c9a529e09969907f912d
author Paul Bakker <p.j.bakker@polarssl.org> Sun Sep 08 15:44:31 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Sun Sep 08 15:44:31 2013 +0200
tree 67f2c7d292023b3590b31459313fd56a14432b84
parent 15162a054a3296636aeceb54a68a8bfbae1f950e

Use ASN1_UTC_TIME in some cases

library/x509write.c

diff --git a/library/x509write.c b/library/x509write.c
index c2af143..d025abb 100644
--- a/library/x509write.c
+++ b/library/x509write.c
@@ -643,11 +643,25 @@
     int ret;
     size_t len = 0;
 
-    ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
-                                              (const unsigned char *) time,
-                                              size ) );
-    ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
-    ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_GENERALIZED_TIME ) );
+    /*
+     * write ASN1_UTC_TIME if year < 2050 (2 bytes shorter)
+     */
+    if( time[0] == '2' && time[1] == '0' && time [2] < '5' )
+    {
+        ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                                             (const unsigned char *) time + 2,
+                                             size - 2 ) );
+        ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_UTC_TIME ) );
+    }
+    else
+    {
+        ASN1_CHK_ADD( len, asn1_write_raw_buffer( p, start,
+                                                  (const unsigned char *) time,
+                                                  size ) );
+        ASN1_CHK_ADD( len, asn1_write_len( p, start, len ) );
+        ASN1_CHK_ADD( len, asn1_write_tag( p, start, ASN1_GENERALIZED_TIME ) );
+    }
 
     return( len );
 }