summaryrefslogtreecommitdiff
path: root/src/regress/lib
diff options
context:
space:
mode:
authortb <>2024-02-18 17:13:29 +0000
committertb <>2024-02-18 17:13:29 +0000
commitccc10fa9e7e3890f48d11a6495136719c954ee7e (patch)
treecf8994c920ca8780ee49bfe61fe7eb793315595d /src/regress/lib
parenteab24b695f55aeecad4699f5cac2bb8aa1393c4f (diff)
downloadopenbsd-ccc10fa9e7e3890f48d11a6495136719c954ee7e.tar.gz
openbsd-ccc10fa9e7e3890f48d11a6495136719c954ee7e.tar.bz2
openbsd-ccc10fa9e7e3890f48d11a6495136719c954ee7e.zip
Tweak previous
Diffstat (limited to 'src/regress/lib')
-rw-r--r--src/regress/lib/libcrypto/asn1/asn1time.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/regress/lib/libcrypto/asn1/asn1time.c b/src/regress/lib/libcrypto/asn1/asn1time.c
index f764df12d5..3fe9f8df3d 100644
--- a/src/regress/lib/libcrypto/asn1/asn1time.c
+++ b/src/regress/lib/libcrypto/asn1/asn1time.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1time.c,v 1.23 2024/02/18 16:56:33 tb Exp $ */ 1/* $OpenBSD: asn1time.c,v 1.24 2024/02/18 17:13:29 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2024 Google Inc. 4 * Copyright (c) 2024 Google Inc.
@@ -649,17 +649,16 @@ asn1_time_overflow(void)
649 "leave copy of max_time unmodified\n"); 649 "leave copy of max_time unmodified\n");
650 goto err; 650 goto err;
651 } 651 }
652 if (OPENSSL_gmtime_adj(&max_time, 0, 1)) { 652 if (OPENSSL_gmtime_adj(&copy, 0, 1)) {
653 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by 1 sec didn't " 653 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by 1 sec didn't "
654 "fail for maximum time\n"); 654 "fail for maximum time\n");
655 goto err; 655 goto err;
656 } 656 }
657 if (memcmp(&zero, &max_time, sizeof(max_time)) != 0) { 657 if (memcmp(&zero, &copy, sizeof(copy)) != 0) {
658 fprintf(stderr, "FAIL: failing OPENSSL_gmtime_adj didn't " 658 fprintf(stderr, "FAIL: failing OPENSSL_gmtime_adj didn't "
659 "zero out max_time\n"); 659 "zero out max_time\n");
660 goto err; 660 goto err;
661 } 661 }
662 max_time = copy;
663 662
664 min_time.tm_year = 0 - 1900; 663 min_time.tm_year = 0 - 1900;
665 min_time.tm_mon = 1 - 1; 664 min_time.tm_mon = 1 - 1;
@@ -679,18 +678,18 @@ asn1_time_overflow(void)
679 "leave copy of min_time unmodified\n"); 678 "leave copy of min_time unmodified\n");
680 goto err; 679 goto err;
681 } 680 }
682 if (OPENSSL_gmtime_adj(&min_time, 0, -1)) { 681 if (OPENSSL_gmtime_adj(&copy, 0, -1)) {
683 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by 1 sec didn't " 682 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by 1 sec didn't "
684 "fail for minimum time\n"); 683 "fail for minimum time\n");
685 goto err; 684 goto err;
686 } 685 }
687 if (memcmp(&zero, &min_time, sizeof(min_time)) != 0) { 686 if (memcmp(&zero, &copy, sizeof(copy)) != 0) {
688 fprintf(stderr, "FAIL: failing OPENSSL_gmtime_adj didn't " 687 fprintf(stderr, "FAIL: failing OPENSSL_gmtime_adj didn't "
689 "zero out max_time\n"); 688 "zero out max_time\n");
690 goto err; 689 goto err;
691 } 690 }
692 min_time = copy;
693 691
692 copy = min_time;
694 /* Test that we can offset by the valid minimum and maximum times. */ 693 /* Test that we can offset by the valid minimum and maximum times. */
695 if (!OPENSSL_gmtime_adj(&copy, 0, valid_time_range)) { 694 if (!OPENSSL_gmtime_adj(&copy, 0, valid_time_range)) {
696 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by maximum range " 695 fprintf(stderr, "FAIL: OPENSSL_gmtime_adj by maximum range "