Commit 01fc2c15 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

fix set but unused warnings

parent 04c80626

fips/aes/fips_aesavs.c

+4 −6
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static int proc_file(char *rqfile, char *rspfile) 
    FILE *afp = NULL, *rfp = NULL;

    char ibuf[2048];

    char tbuf[2048];

    int ilen, len, ret = 0;

    int len;

    char algo[8] = "";

    char amode[8] = "";

    char atest[8] = "";
@@ -605,7 +605,6 @@ static int proc_file(char *rqfile, char *rspfile) 
    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)

	{

	tidy_line(tbuf, ibuf);

	ilen = strlen(ibuf);

	/*      printf("step=%d ibuf=%s",step,ibuf); */

	switch (step)

	    {
@@ -784,7 +783,7 @@ static int proc_file(char *rqfile, char *rspfile) 
		    }

		else

		    {

		    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 

		    AESTest(&ctx, amode, akeysz, aKey, iVec, 

				  dir,  /* 0 = decrypt, 1 = encrypt */

				  plaintext, ciphertext, len);

		    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
@@ -822,7 +821,7 @@ static int proc_file(char *rqfile, char *rspfile) 
		    }

		else

		    {

		    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 

		    AESTest(&ctx, amode, akeysz, aKey, iVec, 

				  dir,  /* 0 = decrypt, 1 = encrypt */

				  plaintext, ciphertext, len);

		    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
@@ -872,7 +871,7 @@ int main(int argc, char **argv) 
    char *rqlist = "req.txt", *rspfile = NULL;

    FILE *fp = NULL;

    char fn[250] = "", rfn[256] = "";

    int f_opt = 0, d_opt = 1;

    int d_opt = 1;

    fips_algtest_init();



    if (argc > 1)
@@ -883,7 +882,6 @@ int main(int argc, char **argv) 
	    }

	else if (strcasecmp(argv[1], "-f") == 0)

	    {

	    f_opt = 1;

	    d_opt = 0;

	    }

	else

fips/aes/fips_gcmtest.c

+1 −2
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ static void xtstest(FILE *in, FILE *out) 
	char *keyword, *value;

	int inlen = 0;

	int encrypt = 0;

	int rv;

	long l;

	unsigned char *key = NULL, *iv = NULL;

	unsigned char *inbuf = NULL, *outbuf = NULL;
@@ -327,7 +326,7 @@ static void xtstest(FILE *in, FILE *out) 
			{

			FIPS_cipherinit(&ctx, xts, key, iv, encrypt);

			outbuf = OPENSSL_malloc(inlen);

			rv = FIPS_cipher(&ctx, outbuf, inbuf, inlen);

			FIPS_cipher(&ctx, outbuf, inbuf, inlen);

			OutputValue(encrypt ? "CT":"PT", outbuf, inlen, out, 0);

			OPENSSL_free(inbuf);

			OPENSSL_free(outbuf);

fips/des/fips_desmovs.c

+4 −6
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int tproc_file(char *rqfile, char *rspfile) 
    char afn[256], rfn[256];

    FILE *afp = NULL, *rfp = NULL;

    char ibuf[2048], tbuf[2048];

    int ilen, len, ret = 0;

    int len;

    char amode[8] = "";

    char atest[100] = "";

    int akeysz=0;
@@ -324,7 +324,6 @@ static int tproc_file(char *rqfile, char *rspfile) 
    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)

	{

	tidy_line(tbuf, ibuf);

	ilen = strlen(ibuf);

	/*	printf("step=%d ibuf=%s",step,ibuf);*/

	if(step == 3 && !strcmp(amode,"ECB"))

	    {
@@ -555,7 +554,7 @@ static int tproc_file(char *rqfile, char *rspfile) 
		else

		    {

		    assert(dir == 1);

		    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 

		    DESTest(&ctx, amode, akeysz, aKey, iVec, 

				  dir,  /* 0 = decrypt, 1 = encrypt */

				  ciphertext, plaintext, len);

		    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
@@ -595,7 +594,7 @@ static int tproc_file(char *rqfile, char *rspfile) 
		else

		    {

		    assert(dir == 0);

		    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 

		    DESTest(&ctx, amode, akeysz, aKey, iVec, 

				  dir,  /* 0 = decrypt, 1 = encrypt */

				  plaintext, ciphertext, len);

		    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
@@ -645,7 +644,7 @@ int main(int argc, char **argv) 
    char *rqlist = "req.txt", *rspfile = NULL;

    FILE *fp = NULL;

    char fn[250] = "", rfn[256] = "";

    int f_opt = 0, d_opt = 1;

    int d_opt = 1;



    fips_algtest_init();

    if (argc > 1)
@@ -656,7 +655,6 @@ int main(int argc, char **argv) 
	    }

	else if (fips_strcasecmp(argv[1], "-f") == 0)

	    {

	    f_opt = 1;

	    d_opt = 0;

	    }

	else