Commit 3ae70939 authored by Richard Levitte's avatar Richard Levitte
Browse files

Correct a lot of printing calls. Remove extra arguments...

parent c433d725

apps/ca.c

+1 −1
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ again2: 


	BIO_printf(bio_err,"Certificate is to be certified until ");

	ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ret));

	if (days) BIO_printf(bio_err," (%d days)",days);

	if (days) BIO_printf(bio_err," (%ld days)",days);

	BIO_printf(bio_err, "\n");



	if (!batch)

apps/ocsp.c

+2 −2
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ int MAIN(int argc, char **argv) 


	if (i != OCSP_RESPONSE_STATUS_SUCCESSFUL)

		{

		BIO_printf(out, "Responder Error: %s (%ld)\n",

		BIO_printf(out, "Responder Error: %s (%d)\n",

				OCSP_response_status_str(i), i);

		ret = 0;

		goto end;
@@ -845,7 +845,7 @@ int MAIN(int argc, char **argv) 


		if(i <= 0)

			{

			BIO_printf(bio_err, "Response Verify Failure\n", i);

			BIO_printf(bio_err, "Response Verify Failure\n");

			ERR_print_errors(bio_err);

			}

		else

apps/pkcs12.c

+3 −2
Original line number Diff line number Diff line
@@ -814,8 +814,9 @@ int alg_print (BIO *x, X509_ALGOR *alg) 
	unsigned char *p;

	p = alg->parameter->value.sequence->data;

	pbe = d2i_PBEPARAM (NULL, &p, alg->parameter->value.sequence->length);

	BIO_printf (bio_err, "%s, Iteration %d\n", 

	OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)), ASN1_INTEGER_get(pbe->iter));

	BIO_printf (bio_err, "%s, Iteration %ld\n", 

		OBJ_nid2ln(OBJ_obj2nid(alg->algorithm)),

		ASN1_INTEGER_get(pbe->iter));

	PBEPARAM_free (pbe);

	return 0;

}

apps/pkcs8.c

+5 −6
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ int MAIN(int argc, char **argv) 
			return (1);

		}

		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {

			BIO_printf(bio_err, "Error converting key\n", outfile);

			BIO_printf(bio_err, "Error converting key\n");

			ERR_print_errors(bio_err);

			return (1);

		}
@@ -259,8 +259,7 @@ int MAIN(int argc, char **argv) 
			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,

					p8pass, strlen(p8pass),

					NULL, 0, iter, p8inf))) {

				BIO_printf(bio_err, "Error encrypting key\n",

								 outfile);

				BIO_printf(bio_err, "Error encrypting key\n");

				ERR_print_errors(bio_err);

				return (1);

			}
@@ -303,7 +302,7 @@ int MAIN(int argc, char **argv) 
		}



		if (!p8) {

			BIO_printf (bio_err, "Error reading key\n", outfile);

			BIO_printf (bio_err, "Error reading key\n");

			ERR_print_errors(bio_err);

			return (1);

		}
@@ -317,13 +316,13 @@ int MAIN(int argc, char **argv) 
	}



	if (!p8inf) {

		BIO_printf(bio_err, "Error decrypting key\n", outfile);

		BIO_printf(bio_err, "Error decrypting key\n");

		ERR_print_errors(bio_err);

		return (1);

	}



	if (!(pkey = EVP_PKCS82PKEY(p8inf))) {

		BIO_printf(bio_err, "Error converting key\n", outfile);

		BIO_printf(bio_err, "Error converting key\n");

		ERR_print_errors(bio_err);

		return (1);

	}

apps/req.c

+2 −2
Original line number Diff line number Diff line
@@ -728,10 +728,10 @@ bad: 
		if (newkey < MIN_KEY_LENGTH && (pkey_type == TYPE_RSA || pkey_type == TYPE_DSA))

			{

			BIO_printf(bio_err,"private key length is too short,\n");

			BIO_printf(bio_err,"it needs to be at least %d bits, not %d\n",MIN_KEY_LENGTH,newkey);

			BIO_printf(bio_err,"it needs to be at least %d bits, not %ld\n",MIN_KEY_LENGTH,newkey);

			goto end;

			}

		BIO_printf(bio_err,"Generating a %d bit %s private key\n",

		BIO_printf(bio_err,"Generating a %ld bit %s private key\n",

			newkey,(pkey_type == TYPE_RSA)?"RSA":

			(pkey_type == TYPE_DSA)?"DSA":"EC");