Correct reading back of tlsext_tick_lifetime_hint from ASN1.

When writing out the hint, if the hint > 0, then we write it out otherwise
we skip it.

Previously when reading the hint back in, if were expecting to see one
(because the ticket length > 0), but it wasn't present then we set the hint
to -1, otherwise we set it to 0. This fails to set the hint to the same as
when it was written out.

The hint should never be negative because the RFC states the hint is
unsigned. It is valid for a server to set the hint to 0 (this means the
lifetime is unspecified according to the RFC). If the server set it to 0, it
should still be 0 when we read it back in.

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index b27e058bc7713959234e194ac6b7988771129f31..63fe17f16e4bfb13696fb152cbcc176595b7bf44 100644 (file)
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -569,9 +569,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
         OPENSSL_free(ai.data);
         ai.data = NULL;
         ai.length = 0;
         OPENSSL_free(ai.data);
         ai.data = NULL;
         ai.length = 0;

-    } else if (ret->tlsext_ticklen && ret->session_id_length)
-        ret->tlsext_tick_lifetime_hint = -1;
-    else
+    } else

         ret->tlsext_tick_lifetime_hint = 0;
     os.length = 0;
     os.data = NULL;
         ret->tlsext_tick_lifetime_hint = 0;
     os.length = 0;
     os.data = NULL;