From 56538526837d8b2a6ee2edb7bb2ece9a0838bd9e Mon Sep 17 00:00:00 2001 From: miod Date: Wed, 16 Jul 2014 17:38:19 +0000 Subject: [PATCH] Fix tlsext_tick_lifetime_hint value in test #2 to make sure the (tlsext_tick_lifetime_hint > 0) test also passes on 32-bit platforms (tlsext_tick_lifetime_hint is a long). --- regress/lib/libssl/asn1/asn1test.c | 58 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/regress/lib/libssl/asn1/asn1test.c b/regress/lib/libssl/asn1/asn1test.c index 135c6ee04a8..cdc9b14db30 100644 --- a/regress/lib/libssl/asn1/asn1test.c +++ b/regress/lib/libssl/asn1/asn1test.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asn1test.c,v 1.1 2014/07/13 16:03:54 jsing Exp $ */ +/* $OpenBSD: asn1test.c,v 1.2 2014/07/16 17:38:19 miod Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -115,12 +115,12 @@ struct ssl_asn1_test ssl_asn1_tests[] = { .timeout = 5, .verify_result = 42, .tlsext_hostname = "libressl.openbsd.org", - .tlsext_tick_lifetime_hint = 0xaabbccdd, + .tlsext_tick_lifetime_hint = 0x7abbccdd, .tlsext_tick = tlsext_tick, .tlsext_ticklen = 207, }, { - 0x30, 0x82, 0x01, 0x59, 0x02, 0x01, 0x01, 0x02, + 0x30, 0x82, 0x01, 0x58, 0x02, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x02, 0x00, 0x01, 0x04, 0x0a, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x04, 0x1a, 0x00, 0x00, 0x00, @@ -136,36 +136,36 @@ struct ssl_asn1_test ssl_asn1_tests[] = { 0x16, 0x04, 0x14, 0x6c, 0x69, 0x62, 0x72, 0x65, 0x73, 0x73, 0x6c, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x62, 0x73, 0x64, 0x2e, 0x6f, 0x72, 0x67, 0xa9, - 0x07, 0x02, 0x05, 0x00, 0xaa, 0xbb, 0xcc, 0xdd, - 0xaa, 0x81, 0xd2, 0x04, 0x81, 0xcf, 0x43, 0x56, - 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, - 0x31, 0x36, 0x30, 0x3a, 0x20, 0x37, 0x74, 0x68, - 0x20, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, - 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, - 0x32, 0x30, 0x31, 0x30, 0x2d, 0x35, 0x32, 0x39, - 0x38, 0x3a, 0x20, 0x38, 0x74, 0x68, 0x20, 0x41, - 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, - 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, - 0x31, 0x34, 0x2d, 0x30, 0x31, 0x39, 0x38, 0x3a, - 0x20, 0x32, 0x31, 0x73, 0x74, 0x20, 0x41, 0x70, + 0x06, 0x02, 0x04, 0x7a, 0xbb, 0xcc, 0xdd, 0xaa, + 0x81, 0xd2, 0x04, 0x81, 0xcf, 0x43, 0x56, 0x45, + 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x31, + 0x36, 0x30, 0x3a, 0x20, 0x37, 0x74, 0x68, 0x20, + 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, + 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, + 0x30, 0x31, 0x30, 0x2d, 0x35, 0x32, 0x39, 0x38, + 0x3a, 0x20, 0x38, 0x74, 0x68, 0x20, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, - 0x34, 0x2d, 0x33, 0x34, 0x37, 0x30, 0x3a, 0x20, - 0x33, 0x30, 0x74, 0x68, 0x20, 0x4d, 0x61, 0x79, - 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, - 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, - 0x31, 0x39, 0x35, 0x3a, 0x20, 0x35, 0x74, 0x68, - 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30, - 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, - 0x30, 0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x31, - 0x3a, 0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75, - 0x6e, 0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, + 0x34, 0x2d, 0x30, 0x31, 0x39, 0x38, 0x3a, 0x20, + 0x32, 0x31, 0x73, 0x74, 0x20, 0x41, 0x70, 0x72, + 0x69, 0x6c, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, - 0x2d, 0x30, 0x32, 0x32, 0x34, 0x3a, 0x20, 0x35, - 0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, - 0x32, 0x30, 0x31, 0x34, 0x0a, + 0x2d, 0x33, 0x34, 0x37, 0x30, 0x3a, 0x20, 0x33, + 0x30, 0x74, 0x68, 0x20, 0x4d, 0x61, 0x79, 0x20, + 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, 0x56, 0x45, + 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, 0x30, 0x31, + 0x39, 0x35, 0x3a, 0x20, 0x35, 0x74, 0x68, 0x20, + 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, 0x30, 0x31, + 0x34, 0x0a, 0x43, 0x56, 0x45, 0x2d, 0x32, 0x30, + 0x31, 0x34, 0x2d, 0x30, 0x32, 0x32, 0x31, 0x3a, + 0x20, 0x35, 0x74, 0x68, 0x20, 0x4a, 0x75, 0x6e, + 0x65, 0x20, 0x32, 0x30, 0x31, 0x34, 0x0a, 0x43, + 0x56, 0x45, 0x2d, 0x32, 0x30, 0x31, 0x34, 0x2d, + 0x30, 0x32, 0x32, 0x34, 0x3a, 0x20, 0x35, 0x74, + 0x68, 0x20, 0x4a, 0x75, 0x6e, 0x65, 0x20, 0x32, + 0x30, 0x31, 0x34, 0x0a, }, - 349, + 348, }, }; -- 2.20.1