Add support for memory leak checking in fips_algvs.

[openssl.git] / fips / des / fips_desmovs.c

diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index 30fa01fa3cf0b4bcf4d5de1659bac2307c8189ab..79900aeae28e18e7f55c6f1beaf7c8749129639f 100644 (file)
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -102,7 +102,7 @@ static int DESTest(EVP_CIPHER_CTX *ctx,
     if (akeysz != 192)
        {
        printf("Invalid key size: %d\n", akeysz);
-       EXIT(1);
+       return 0;
        }
 
     if (fips_strcasecmp(amode, "CBC") == 0)
@@ -120,7 +120,7 @@ static int DESTest(EVP_CIPHER_CTX *ctx,
     else
        {
        printf("Unknown mode: %s\n", amode);
-       EXIT(1);
+       return 0;
        }
 
     if (FIPS_cipherinit(ctx, cipher, aKey, iVec, dir) <= 0)
@@ -155,12 +155,12 @@ static void shiftin(unsigned char *dst,unsigned char *src,int nbits)
     }  
 
 /*-----------------------------------------------*/
-char *t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
-char *t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB64"};
-enum Mode {CBC, ECB, OFB, CFB1, CFB8, CFB64};
+char *tdes_t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
+char *tdes_t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB64"};
+enum tdes_Mode {TCBC, TECB, TOFB, TCFB1, TCFB8, TCFB64};
 int Sizes[6]={64,64,64,1,8,64};
 
-static void do_mct(char *amode, 
+static int do_tmct(char *amode, 
            int akeysz, int numkeys, unsigned char *akey,unsigned char *ivec,
            int dir, unsigned char *text, int len,
            FILE *rfp)
@@ -170,12 +170,12 @@ static void do_mct(char *amode,
     unsigned char text0[8];
 
     for (imode=0 ; imode < 6 ; ++imode)
-       if(!strcmp(amode,t_mode[imode]))
+       if(!strcmp(amode,tdes_t_mode[imode]))
            break;
     if (imode == 6)
        { 
        printf("Unrecognized mode: %s\n", amode);
-       EXIT(1);
+       return 0;
        }
     for(i=0 ; i < 400 ; ++i)
        {
@@ -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
@@ -196,12 +196,12 @@ static void do_mct(char *amode,
                OutputValue("",akey+n*8,8,rfp,0);
                }
 
-       if(imode != ECB)
+       if(imode != TECB)
            OutputValue("IV",ivec,8,rfp,0);
-       OutputValue(t_tag[dir^1],text,len,rfp,imode == CFB1);
+       OutputValue(tdes_t_tag[dir^1],text,len,rfp,imode == TCFB1);
 #if 0
        /* compensate for endianness */
-       if(imode == CFB1)
+       if(imode == TCFB1)
            text[0]<<=7;
 #endif
        memcpy(text0,text,8);
@@ -223,18 +223,18 @@ static void do_mct(char *amode,
                }
            if(j == 9999)
                {
-               OutputValue(t_tag[dir],text,len,rfp,imode == CFB1);
+               OutputValue(tdes_t_tag[dir],text,len,rfp,imode == TCFB1);
                /*              memcpy(ivec,text,8); */
                }
            /*      DebugValue("iv",ctx.iv,8); */
            /* accumulate material for the next key */
            shiftin(nk,text,Sizes[imode]);
            /*      DebugValue("nk",nk,24);*/
-           if((dir && (imode == CFB1 || imode == CFB8 || imode == CFB64
-                       || imode == CBC)) || imode == OFB)
+           if((dir && (imode == TCFB1 || imode == TCFB8
+                       || imode == TCFB64 || imode == TCBC)) || imode == TOFB)
                memcpy(text,old_iv,8);
 
-           if(!dir && (imode == CFB1 || imode == CFB8 || imode == CFB64))
+           if(!dir && (imode == TCFB1 || imode == TCFB8 || imode == TCFB64))
                {
                /* the test specifies using the output of the raw DES operation
                   which we don't have, so reconstruct it... */
@@ -260,13 +260,15 @@ static void do_mct(char *amode,
        /* pointless exercise - the final text doesn't depend on the
           initial text in OFB mode, so who cares what it is? (Who
           designed these tests?) */
-       if(imode == OFB)
+       if(imode == TOFB)
            for(n=0 ; n < 8 ; ++n)
                text[n]=text0[n]^old_iv[n];
+       FIPS_cipher_ctx_cleanup(&ctx);
        }
+    return 1;
     }
     
-static int proc_file(char *rqfile, char *rspfile)
+static int tproc_file(char *rqfile, char *rspfile)
     {
     char afn[256], rfn[256];
     FILE *afp = NULL, *rfp = NULL;
@@ -341,7 +343,7 @@ static int proc_file(char *rqfile, char *rspfile)
                    }
                else
                    {
-                   fputs(ibuf, rfp);
+                   copy_line(ibuf, rfp);
                    ++ step;
                    }
                }
@@ -357,11 +359,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 +400,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 +425,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 +444,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 +500,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 +522,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");
@@ -545,7 +548,9 @@ static int proc_file(char *rqfile, char *rspfile)
                PrintValue("PLAINTEXT", (unsigned char*)plaintext, len);
                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
                    {
-                   do_mct(amode,akeysz,numkeys,aKey,iVec,dir,plaintext,len,rfp);
+                   if (!do_tmct(amode,akeysz,numkeys,aKey,iVec,
+                                       dir,plaintext,len,rfp))
+                       return -1;
                    }
                else
                    {
@@ -562,7 +567,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");
@@ -584,7 +589,7 @@ static int proc_file(char *rqfile, char *rspfile)
                PrintValue("CIPHERTEXT", ciphertext, len);
                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
                    {
-                   do_mct(amode, akeysz, numkeys, aKey, iVec, 
+                   do_tmct(amode, akeysz, numkeys, aKey, iVec, 
                           dir, ciphertext, len, rfp);
                    }
                else
@@ -608,7 +613,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;
@@ -618,6 +623,7 @@ static int proc_file(char *rqfile, char *rspfile)
        fclose(rfp);
     if (afp)
        fclose(afp);
+    FIPS_cipher_ctx_cleanup(&ctx);
     return err;
     }
 
@@ -630,7 +636,11 @@ static int proc_file(char *rqfile, char *rspfile)
     aes_test -d xxxxx.xxx
   The default is: -d req.txt
 --------------------------------------------------*/
+#ifdef FIPS_ALGVS
+int fips_desmovs_main(int argc, char **argv)
+#else
 int main(int argc, char **argv)
+#endif
     {
     char *rqlist = "req.txt", *rspfile = NULL;
     FILE *fp = NULL;
@@ -679,10 +689,10 @@ int main(int argc, char **argv)
            strtok(fn, "\r\n");
            strcpy(rfn, fn);
            printf("Processing: %s\n", rfn);
-           if (proc_file(rfn, rspfile))
+           if (tproc_file(rfn, rspfile))
                {
                printf(">>> Processing failed for: %s <<<\n", rfn);
-               EXIT(1);
+               return -1;
                }
            }
        fclose(fp);
@@ -691,12 +701,11 @@ int main(int argc, char **argv)
        {
        if (VERBOSE)
                printf("Processing: %s\n", fn);
-       if (proc_file(fn, rspfile))
+       if (tproc_file(fn, rspfile))
            {
            printf(">>> Processing failed for: %s <<<\n", fn);
            }
        }
-    EXIT(0);
     return 0;
     }