diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-10-01 20:42:52 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-10-01 20:42:52 +0000 |
| commit | 4cc2bbab6758b73e005d69cb454cb9ba269859df (patch) | |
| tree | 6c3d6059670677b55dd7756b1b24840880d20088 /fips/des | |
| parent | 04c3aa5c1ab4244293ca60f6aeabb431e8b44cbe (diff) | |
Make fips algorithm test utilities use RESP_EOL for end of line character(s).
This should be CRLF even under *nix.
Diffstat (limited to 'fips/des')
| -rw-r--r-- | fips/des/fips_desmovs.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c index 30fa01fa3c..e8766561ce 100644 --- a/fips/des/fips_desmovs.c +++ b/fips/des/fips_desmovs.c @@ -186,7 +186,7 @@ static void do_mct(char *amode, EVP_CIPHER_CTX ctx; FIPS_cipher_ctx_init(&ctx); - fprintf(rfp,"\nCOUNT = %d\n",i); + fprintf(rfp,RESP_EOL "COUNT = %d" RESP_EOL,i); if(kp == 1) OutputValue("KEY",akey,8,rfp,0); else @@ -341,7 +341,7 @@ static int proc_file(char *rqfile, char *rspfile) } else { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); ++ step; } } @@ -357,11 +357,12 @@ static int proc_file(char *rqfile, char *rspfile) if(*amode) { /* insert current time & date */ time_t rtim = time(0); - fprintf(rfp, "# %s", ctime(&rtim)); + fputs("# ", rfp); + copy_line(ctime(&rtim), rfp); } else { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); if(!strncmp(pp,"INVERSE ",8) || !strncmp(pp,"DES ",4) || !strncmp(pp,"TDES ",5) || !strncmp(pp,"PERMUTATION ",12) @@ -397,7 +398,7 @@ static int proc_file(char *rqfile, char *rspfile) break; if (ibuf[0] == '[') { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); ++step; if (fips_strncasecmp(ibuf, "[ENCRYPT]", 9) == 0) dir = 1; @@ -422,17 +423,17 @@ static int proc_file(char *rqfile, char *rspfile) case 2: /* KEY = xxxx */ if(*ibuf == '\n') { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); break; } if(!fips_strncasecmp(ibuf,"COUNT = ",8)) { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); break; } if(!fips_strncasecmp(ibuf,"COUNT=",6)) { - fputs(ibuf, rfp); + copy_line(ibuf, rfp); break; } if(!fips_strncasecmp(ibuf,"NumKeys = ",10)) @@ -441,7 +442,7 @@ static int proc_file(char *rqfile, char *rspfile) break; } if (echo) - fputs(ibuf, rfp); + copy_line(ibuf, rfp); if(!fips_strncasecmp(ibuf,"KEY = ",6)) { akeysz=64; @@ -497,7 +498,7 @@ static int proc_file(char *rqfile, char *rspfile) case 3: /* IV = xxxx */ if (echo) - fputs(ibuf, rfp); + copy_line(ibuf, rfp); if (fips_strncasecmp(ibuf, "IV = ", 5) != 0) { printf("Missing IV\n"); @@ -519,7 +520,7 @@ static int proc_file(char *rqfile, char *rspfile) case 4: /* PLAINTEXT = xxxx */ if (echo) - fputs(ibuf, rfp); + copy_line(ibuf, rfp); if (fips_strncasecmp(ibuf, "PLAINTEXT = ", 12) != 0) { printf("Missing PLAINTEXT\n"); @@ -562,7 +563,7 @@ static int proc_file(char *rqfile, char *rspfile) case 5: /* CIPHERTEXT = xxxx */ if (echo) - fputs(ibuf, rfp); + copy_line(ibuf, rfp); if (fips_strncasecmp(ibuf, "CIPHERTEXT = ", 13) != 0) { printf("Missing KEY\n"); @@ -608,7 +609,7 @@ static int proc_file(char *rqfile, char *rspfile) } else if (strcmp(atest, "MCT") != 0) { /* MCT already added terminating nl */ - fputs(ibuf, rfp); + copy_line(ibuf, rfp); } step = 1; break; |