From: Dr. Stephen Henson Date: Fri, 18 May 2012 15:05:33 +0000 (+0000) Subject: don't insert time in response files: it breaks some systems and we shouldn't be doing... X-Git-Tag: OpenSSL-fips-2_0-pl1~28 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fcb81a191d3647fd07811ab64447b8061dd01e3b;p=oweals%2Fopenssl.git don't insert time in response files: it breaks some systems and we shouldn't be doing this anyway --- diff --git a/CHANGES b/CHANGES index fe19d3a80c..e8464c7ae3 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,11 @@ Changes between 1.0.1 and 1.1.0 [xx XXX xxxx] + *) Don't attempt to insert current time into AES/3DES tests, we should + be just copying input line across and this breaks some systems lacking + ctime. + [Steve Henson] + *) Update Windows build system for FIPS. Don't compile algorithm test utilties by default: the target build_tests is needed for that. Add support for building fips_algvs with the build_algvs target. diff --git a/fips/aes/fips_aesavs.c b/fips/aes/fips_aesavs.c index fecaf990c6..ce07cac992 100644 --- a/fips/aes/fips_aesavs.c +++ b/fips/aes/fips_aesavs.c @@ -635,10 +635,8 @@ static int proc_file(char *rqfile, char *rspfile) char *xp, *pp = ibuf+2; int n; if (akeysz) - { /* insert current time & date */ - time_t rtim = time(0); - fputs("# ", rfp); - copy_line(ctime(&rtim), rfp); + { + copy_line(ibuf, rfp); } else { diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c index 2bbeb53459..0ffab89e2f 100644 --- a/fips/des/fips_desmovs.c +++ b/fips/des/fips_desmovs.c @@ -356,10 +356,8 @@ static int tproc_file(char *rqfile, char *rspfile) char *xp, *pp = ibuf+2; int n; if(*amode) - { /* insert current time & date */ - time_t rtim = time(0); - fputs("# ", rfp); - copy_line(ctime(&rtim), rfp); + { + copy_line(ibuf, rfp); } else {