Check OPENSSL_gmtime_diff
It's test code that only runs on 64bit time_t machines. Move it to a standalone test/gmdifftest Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
Rich Salz
parent
b51bce9420
commit
3a3cb629d9
@ -378,63 +378,3 @@ static void julian_to_date(long jd, int *y, int *m, int *d)
|
||||
*m = j + 2 - (12 * L);
|
||||
*y = 100 * (n - 49) + i + L;
|
||||
}
|
||||
|
||||
#ifdef OPENSSL_TIME_TEST
|
||||
|
||||
# include <stdio.h>
|
||||
|
||||
/*
|
||||
* Time checking test code. Check times are identical for a wide range of
|
||||
* offsets. This should be run on a machine with 64 bit time_t or it will
|
||||
* trigger the very errors the routines fix.
|
||||
*/
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
long offset;
|
||||
for (offset = 0; offset < 1000000; offset++) {
|
||||
check_time(offset);
|
||||
check_time(-offset);
|
||||
check_time(offset * 1000);
|
||||
check_time(-offset * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
int check_time(long offset)
|
||||
{
|
||||
struct tm tm1, tm2, o1;
|
||||
int off_day, off_sec;
|
||||
long toffset;
|
||||
time_t t1, t2;
|
||||
time(&t1);
|
||||
t2 = t1 + offset;
|
||||
OPENSSL_gmtime(&t2, &tm2);
|
||||
OPENSSL_gmtime(&t1, &tm1);
|
||||
o1 = tm1;
|
||||
OPENSSL_gmtime_adj(&tm1, 0, offset);
|
||||
if ((tm1.tm_year != tm2.tm_year) ||
|
||||
(tm1.tm_mon != tm2.tm_mon) ||
|
||||
(tm1.tm_mday != tm2.tm_mday) ||
|
||||
(tm1.tm_hour != tm2.tm_hour) ||
|
||||
(tm1.tm_min != tm2.tm_min) || (tm1.tm_sec != tm2.tm_sec)) {
|
||||
fprintf(stderr, "TIME ERROR!!\n");
|
||||
fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
|
||||
tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
|
||||
tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
|
||||
fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
|
||||
tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
|
||||
tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
|
||||
return 0;
|
||||
}
|
||||
OPENSSL_gmtime_diff(&o1, &tm1, &off_day, &off_sec);
|
||||
toffset = (long)off_day *SECS_PER_DAY + off_sec;
|
||||
if (offset != toffset) {
|
||||
fprintf(stderr, "TIME OFFSET ERROR!!\n");
|
||||
fprintf(stderr, "Expected %ld, Got %ld (%d:%d)\n",
|
||||
offset, toffset, off_day, off_sec);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -34,6 +34,7 @@ ECTEST= ectest
|
||||
ECDSATEST= ecdsatest
|
||||
ECDHTEST= ecdhtest
|
||||
EXPTEST= exptest
|
||||
GMDIFFTEST= gmdifftest
|
||||
IDEATEST= ideatest
|
||||
SHA1TEST= sha1test
|
||||
SHA256TEST= sha256t
|
||||
@ -78,7 +79,7 @@ SSLSKEWITH0PTEST= sslskewith0ptest.pl
|
||||
|
||||
TESTS= alltests
|
||||
|
||||
EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \
|
||||
EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)$(EXE_EXT) $(GMDIFFTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) \
|
||||
$(MD2TEST)$(EXE_EXT) $(MD4TEST)$(EXE_EXT) $(MD5TEST)$(EXE_EXT) $(HMACTEST)$(EXE_EXT) $(WPTEST)$(EXE_EXT) \
|
||||
$(RC2TEST)$(EXE_EXT) $(RC4TEST)$(EXE_EXT) $(RC5TEST)$(EXE_EXT) \
|
||||
$(DESTEST)$(EXE_EXT) $(SHA1TEST)$(EXE_EXT) $(SHA256TEST)$(EXE_EXT) $(SHA512TEST)$(EXE_EXT) \
|
||||
@ -96,7 +97,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
|
||||
|
||||
# $(METHTEST)$(EXE_EXT)
|
||||
|
||||
OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
|
||||
OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(GMDIFFTEST).o $(IDEATEST).o \
|
||||
$(MD2TEST).o $(MD4TEST).o $(MD5TEST).o \
|
||||
$(HMACTEST).o $(WPTEST).o \
|
||||
$(RC2TEST).o $(RC4TEST).o $(RC5TEST).o \
|
||||
@ -109,7 +110,7 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
|
||||
$(CONSTTIMETEST).o $(VERIFYEXTRATEST).o $(CLIENTHELLOTEST).o \
|
||||
$(PACKETTEST).o testutil.o
|
||||
|
||||
SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
|
||||
SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(GMDIFFTEST).c $(IDEATEST).c \
|
||||
$(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \
|
||||
$(HMACTEST).c $(WPTEST).c \
|
||||
$(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \
|
||||
@ -150,7 +151,7 @@ apps:
|
||||
@(cd ..; $(MAKE) DIRS=apps all)
|
||||
|
||||
alltests: \
|
||||
test_des test_idea test_sha test_md4 test_md5 test_hmac \
|
||||
test_des test_gmdiff test_idea test_sha test_md4 test_md5 test_hmac \
|
||||
test_md2 test_mdc2 test_wp \
|
||||
test_rmd test_rc2 test_rc4 test_rc5 test_bf test_cast \
|
||||
test_rand test_bn test_ec test_ecdsa test_ecdh \
|
||||
@ -179,6 +180,10 @@ test_des: $(DESTEST)$(EXE_EXT)
|
||||
@echo $(START) $@
|
||||
../util/shlib_wrap.sh ./$(DESTEST)
|
||||
|
||||
test_gmdiff: $(GMDIFFTEST)$(EXE_EXT)
|
||||
@echo $(START) $@
|
||||
../util/shlib_wrap.sh ./$(GMDIFFTEST)
|
||||
|
||||
test_idea: $(IDEATEST)$(EXE_EXT)
|
||||
@echo $(START) $@
|
||||
../util/shlib_wrap.sh ./$(IDEATEST)
|
||||
@ -496,6 +501,9 @@ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
|
||||
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
|
||||
@target=$(IDEATEST); $(BUILD_CMD)
|
||||
|
||||
$(GMDIFFTEST)$(EXE_EXT): $(GMDIFFTEST).o $(DLIBCRYPTO)
|
||||
@target=$(GMDIFFTEST); $(BUILD_CMD)
|
||||
|
||||
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
|
||||
@target=$(MD2TEST); $(BUILD_CMD)
|
||||
|
||||
@ -794,6 +802,11 @@ exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
|
||||
exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
|
||||
exptest.o: ../include/openssl/symhacks.h exptest.c
|
||||
gmdifftest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
|
||||
gmdifftest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
|
||||
gmdifftest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
|
||||
gmdifftest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
|
||||
gmdifftest.o: gmdifftest.c
|
||||
gost2814789test.o: ../e_os.h ../engines/ccgost/gost89.h
|
||||
gost2814789test.o: ../include/openssl/asn1.h ../include/openssl/bio.h
|
||||
gost2814789test.o: ../include/openssl/buffer.h ../include/openssl/conf.h
|
||||
|
||||
126
test/gmdifftest.c
Normal file
126
test/gmdifftest.c
Normal file
@ -0,0 +1,126 @@
|
||||
/* ====================================================================
|
||||
* Copyright (c) 2001-2015 The OpenSSL Project. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in
|
||||
* the documentation and/or other materials provided with the
|
||||
* distribution.
|
||||
*
|
||||
* 3. All advertising materials mentioning features or use of this
|
||||
* software must display the following acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
||||
*
|
||||
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
||||
* endorse or promote products derived from this software without
|
||||
* prior written permission. For written permission, please contact
|
||||
* licensing@OpenSSL.org.
|
||||
*
|
||||
* 5. Products derived from this software may not be called "OpenSSL"
|
||||
* nor may "OpenSSL" appear in their names without prior written
|
||||
* permission of the OpenSSL Project.
|
||||
*
|
||||
* 6. Redistributions of any form whatsoever must retain the following
|
||||
* acknowledgment:
|
||||
* "This product includes software developed by the OpenSSL Project
|
||||
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
||||
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
||||
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
* ====================================================================
|
||||
*
|
||||
* This product includes cryptographic software written by Eric Young
|
||||
* (eay@cryptsoft.com). This product includes software written by Tim
|
||||
* Hudson (tjh@cryptsoft.com).
|
||||
*
|
||||
*/
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#define SECS_PER_DAY (24 * 60 * 60)
|
||||
|
||||
/*
|
||||
* Time checking test code. Check times are identical for a wide range of
|
||||
* offsets. This should be run on a machine with 64 bit time_t or it will
|
||||
* trigger the very errors the routines fix.
|
||||
*/
|
||||
|
||||
static int check_time(long offset)
|
||||
{
|
||||
struct tm tm1, tm2, o1;
|
||||
int off_day, off_sec;
|
||||
long toffset;
|
||||
time_t t1, t2;
|
||||
time(&t1);
|
||||
|
||||
t2 = t1 + offset;
|
||||
OPENSSL_gmtime(&t2, &tm2);
|
||||
OPENSSL_gmtime(&t1, &tm1);
|
||||
o1 = tm1;
|
||||
OPENSSL_gmtime_adj(&tm1, 0, offset);
|
||||
if ((tm1.tm_year != tm2.tm_year) ||
|
||||
(tm1.tm_mon != tm2.tm_mon) ||
|
||||
(tm1.tm_mday != tm2.tm_mday) ||
|
||||
(tm1.tm_hour != tm2.tm_hour) ||
|
||||
(tm1.tm_min != tm2.tm_min) || (tm1.tm_sec != tm2.tm_sec)) {
|
||||
fprintf(stderr, "TIME ERROR!!\n");
|
||||
fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
|
||||
tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
|
||||
tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
|
||||
fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
|
||||
tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
|
||||
tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
|
||||
return 0;
|
||||
}
|
||||
if (!OPENSSL_gmtime_diff(&off_day, &off_sec, &o1, &tm1))
|
||||
return 0;
|
||||
toffset = (long)off_day *SECS_PER_DAY + off_sec;
|
||||
if (offset != toffset) {
|
||||
fprintf(stderr, "TIME OFFSET ERROR!!\n");
|
||||
fprintf(stderr, "Expected %ld, Got %ld (%d:%d)\n",
|
||||
offset, toffset, off_day, off_sec);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
long offset;
|
||||
int fails;
|
||||
|
||||
if (sizeof(time_t) < 8) {
|
||||
fprintf(stderr, "Skipping; time_t is less than 64-bits\n");
|
||||
return 0;
|
||||
}
|
||||
for (fails = 0, offset = 0; offset < 1000000; offset++) {
|
||||
if (!check_time(offset))
|
||||
fails++;
|
||||
if (!check_time(-offset))
|
||||
fails++;
|
||||
if (!check_time(offset * 1000))
|
||||
fails++;
|
||||
if (!check_time(-offset * 1000))
|
||||
fails++;
|
||||
}
|
||||
|
||||
return fails ? 1 : 0;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user