diff -Naurp libpki-0.6.4/src/tools/pki-cert.c libpki-0.6.4.oden/src/tools/pki-cert.c
--- libpki-0.6.4/src/tools/pki-cert.c 2011-02-09 18:07:11.000000000 +0100
+++ libpki-0.6.4.oden/src/tools/pki-cert.c 2011-02-17 12:13:04.598098694 +0100
@@ -28,8 +28,8 @@ char usage_str[] =
void usage ( void ) {
- printf( banner );
- printf( usage_str );
+ printf( "%s", banner );
+ printf( "%s", usage_str );
printf(" Where options are:\n");
printf(BLUE " -in " RED "<URI> " NORM "...........: Loads the certificate from <URI>\n");
@@ -107,7 +107,7 @@ int main (int argc, char *argv[] ) {
} else if(strncmp_nocase(argv[i],"-verbose", 8) == 0 ) {
verbose=1;
} else {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf( stderr, BOLD RED "\n ERROR: "
NORM "Unreckognized parameter \'" BOLD BLUE
"%s" NORM "\'\n\n",
@@ -117,7 +117,7 @@ int main (int argc, char *argv[] ) {
}
if((outUrl=getParsedUrl(outfile)) == NULL ) {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", outfile );
@@ -125,7 +125,7 @@ int main (int argc, char *argv[] ) {
};
if((inUrl=getParsedUrl(infile)) == NULL ) {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", infile );
@@ -146,7 +146,7 @@ int main (int argc, char *argv[] ) {
} else if (strncmp_nocase(outform_s, "URL", 3) == 0 ) {
outform = PKI_DATA_FORMAT_URL;
} else {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "output format \"" BLUE "%s" NORM
"\" is not valid (use one of PEM, DER, TXT, XML)!\n\n", outform_s );
@@ -167,7 +167,7 @@ int main (int argc, char *argv[] ) {
exit(1);
}
- if(verbose) fprintf( stderr, banner );
+ if(verbose) fprintf( stderr, "%s", banner );
if(verbose) {
fprintf( stderr, BOLD "\n Initialization:" NORM "\n");
diff -Naurp libpki-0.6.4/src/tools/pki-crl.c libpki-0.6.4.oden/src/tools/pki-crl.c
--- libpki-0.6.4/src/tools/pki-crl.c 2011-02-14 20:18:00.000000000 +0100
+++ libpki-0.6.4.oden/src/tools/pki-crl.c 2011-02-17 12:16:19.618976549 +0100
@@ -29,8 +29,8 @@ char usage_str[] =
void usage ( void ) {
int i = 0;
- printf( banner );
- printf( usage_str );
+ printf( "%s", banner );
+ printf( "%s", usage_str );
printf(" Where options are:\n");
printf(BLUE " -new " NORM "................: Generates a new CRL\n");
@@ -188,7 +188,8 @@ int main (int argc, char *argv[] ) {
exit(1);
}
if( PKI_STACK_X509_CRL_ENTRY_push( entryStack, crlEntry ) == PKI_ERR ) {
- fprintf(stderr, "ERROR, can not add entry %s to CRL entries' stack!\n\n");
+ fprintf(stderr, "ERROR, can not add entry %s to CRL entries' stack!\n\n",
+ entry_s);
exit ( 1 );
};
} else if ( strncmp_nocase ( argv[i], "-passin", 7 ) == 0) {
@@ -246,7 +247,7 @@ int main (int argc, char *argv[] ) {
} else if(strncmp_nocase(argv[i],"-verbose", 8) == 0 ) {
verbose=1;
} else {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf( stderr, BOLD RED "\n ERROR: "
NORM "Unreckognized parameter \'" BOLD BLUE
"%s" NORM "\'\n\n",
@@ -256,7 +257,7 @@ int main (int argc, char *argv[] ) {
}
if((outUrl=getParsedUrl(outfile)) == NULL ) {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", outfile );
@@ -264,7 +265,7 @@ int main (int argc, char *argv[] ) {
};
if((inUrl=getParsedUrl(infile)) == NULL ) {
- if(verbose) fprintf(stderr, banner );
+ if(verbose) fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", infile );
@@ -285,7 +286,7 @@ int main (int argc, char *argv[] ) {
} else if (strncmp_nocase(outform_s, "URL", 3) == 0 ) {
outform = PKI_DATA_FORMAT_URL;
} else {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED "\n ERROR: "
NORM "output format \"" BLUE "%s" NORM
"\" is not valid (use one of PEM, DER, TXT, XML)!\n\n", outform_s );
@@ -306,7 +307,7 @@ int main (int argc, char *argv[] ) {
exit(1);
}
- if(verbose) fprintf( stderr, banner );
+ if(verbose) fprintf( stderr, "%s", banner );
if(verbose) {
fprintf( stderr, BOLD "\n Initialization:" NORM "\n");
diff -Naurp libpki-0.6.4/src/tools/pki-query.c libpki-0.6.4.oden/src/tools/pki-query.c
--- libpki-0.6.4/src/tools/pki-query.c 2010-09-02 19:12:41.000000000 +0200
+++ libpki-0.6.4.oden/src/tools/pki-query.c 2011-02-17 12:05:31.416117013 +0100
@@ -28,8 +28,8 @@ char usage_str[] =
void usage ( void ) {
- printf( banner );
- printf( usage_str );
+ printf( "%s", banner );
+ printf( "%s", usage_str );
printf(" Where options are:\n");
printf(BLUE " -new " NORM "................: Generate a new PRQP request\n");
@@ -78,7 +78,7 @@ void help ( void ) {
int c = 0;
printf("\n");
- printf( banner );
+ printf( "%s", banner );
printf(
" This tool uses the " BOLD "PKI Resource Query Protocol (PRQP)" NORM " to query a\n"
@@ -126,8 +126,8 @@ void help_services ( void ) {
int c = 0;
- printf( banner );
- printf( usage_str );
+ printf( "%s", banner );
+ printf( "%s", usage_str );
printf( "\nWhere service " RED "<id>" NORM " can be:\n\n" );
printf(BOLD " * General Services\n" NORM);
@@ -266,7 +266,7 @@ int main (int argc, char *argv[] ) {
break;
}
if((url=getParsedUrl(argv[++i])) == NULL ) {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED " ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", argv[i] );
@@ -318,7 +318,7 @@ int main (int argc, char *argv[] ) {
} else if ( strcmp ( argv[i], "-verbose") == 0 ) {
verbose=1;
} else {
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: "
NORM "Unreckognized parameter \'" BOLD BLUE
"%s" NORM "\'\n\n",
@@ -328,7 +328,7 @@ int main (int argc, char *argv[] ) {
}
if( !cacertfile && !subject_s && !clientcertfile ) {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED " ERROR: " NORM "parameter \"" BLUE
"-cacert" NORM "\" is required!\n\n" );
exit(1);
@@ -339,7 +339,7 @@ int main (int argc, char *argv[] ) {
}
if( ( url ) && ( url->proto == URI_PROTO_FILE ) ) {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED " ERROR: " NORM "url \"" BLUE
"%s" NORM "\" is not valid!\n\n", url->url_s );
exit(1);
@@ -355,14 +355,14 @@ int main (int argc, char *argv[] ) {
}
if( !in_url && !new ) {
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, RED BOLD " ERROR:" NORM
" one of " BLUE "-new" NORM " or " BLUE
"-in <URL> " NORM "option is required!\n\n" );
exit(1);
}
- if(verbose) fprintf( stderr, banner );
+ if(verbose) fprintf( stderr, "%s", banner );
if(verbose) {
fprintf( stderr, BOLD "\n Initialization:" NORM "\n");
@@ -403,7 +403,7 @@ int main (int argc, char *argv[] ) {
if(PKI_X509_PRQP_REQ_add_service( p, ss ) == PKI_ERR ) {
if( verbose ) fprintf( stderr, RED "ERROR!"
NORM "\n");
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: "
NORM "Unknown requested service name \'"
BLUE "%s" NORM "\'\n\n", ss);
@@ -423,7 +423,7 @@ int main (int argc, char *argv[] ) {
p = PKI_X509_PRQP_REQ_get_url( in_url, NULL, NULL );
if( !p ) {
if ( verbose ) fprintf( stderr, RED "ERROR!" NORM "\n");
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: " NORM
"Can not load PRQP request from \'"
BOLD BLUE "%s" NORM "\'\n\n",
diff -Naurp libpki-0.6.4/src/tools/pki-request.c libpki-0.6.4.oden/src/tools/pki-request.c
--- libpki-0.6.4/src/tools/pki-request.c 2010-09-02 19:12:41.000000000 +0200
+++ libpki-0.6.4.oden/src/tools/pki-request.c 2011-02-17 12:05:31.416117013 +0100
@@ -35,8 +35,8 @@ char usage_str[] =
void usage ( void ) {
- printf( banner );
- printf( usage_str );
+ printf( "%s", banner );
+ printf( "%s", usage_str );
printf(" Where options are:\n");
printf(BLUE " -in " RED "<URI> " NORM "...........: URI for the PKCS#10 Request" EE );
@@ -71,7 +71,7 @@ void usage ( void ) {
void help ( void ) {
printf("\n");
- printf( banner );
+ printf( "%s", banner );
printf(
" This tool receives a PKCS#10 request as input and sends it to a CA" EE
@@ -136,7 +136,7 @@ int main (int argc, char *argv[] ) {
} else if ( strcmp( argv[1], "get" ) == 0 ) {
cmd = GET_CERT;
} else {
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: "
NORM "Unreckognized command \'" BOLD BLUE
"%s" NORM "\'\n\n",
@@ -158,7 +158,7 @@ int main (int argc, char *argv[] ) {
break;
}
if((url=getParsedUrl(argv[++i])) == NULL ) {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED " ERROR: "
NORM "url \"" BLUE "%s" NORM
"\" is not valid!\n\n", argv[i] );
@@ -205,7 +205,7 @@ int main (int argc, char *argv[] ) {
} else if ( strcmp ( argv[i], "-verbose") == 0 ) {
verbose=1;
} else {
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: "
NORM "Unreckognized parameter \'" BOLD BLUE
"%s" NORM "\'\n\n",
@@ -219,7 +219,7 @@ int main (int argc, char *argv[] ) {
}
if( ( url ) && ( url->proto == URI_PROTO_FILE ) ) {
- fprintf(stderr, banner );
+ fprintf(stderr, "%s", banner );
fprintf(stderr, BOLD RED " ERROR: " NORM "url \"" BLUE
"%s" NORM "\" is not valid!\n\n", url->url_s );
exit(1);
@@ -234,13 +234,13 @@ int main (int argc, char *argv[] ) {
}
if( !in_url ) {
- fprintf( stderr, banner );
+ fprintf( stderr,"%s", banner );
fprintf( stderr, RED BOLD " ERROR:" NORM
BLUE "-in <URL> " NORM "option is required!\n\n" );
exit(1);
}
- if(verbose) fprintf( stderr, banner );
+ if(verbose) fprintf( stderr, "%s", banner );
/*
if(verbose) {
@@ -281,7 +281,7 @@ int main (int argc, char *argv[] ) {
if(PKI_X509_PRQP_REQ_add_service( p, ss ) == PKI_ERR ) {
if( verbose ) fprintf( stderr, RED "ERROR!"
NORM "\n");
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: "
NORM "Unknown requested service name \'"
BLUE "%s" NORM "\'\n\n", ss);
@@ -301,7 +301,7 @@ int main (int argc, char *argv[] ) {
p = PKI_X509_PRQP_REQ_get_url( in_url, NULL, NULL );
if( !p ) {
if ( verbose ) fprintf( stderr, RED "ERROR!" NORM "\n");
- fprintf( stderr, banner );
+ fprintf( stderr, "%s", banner );
fprintf( stderr, BOLD RED " ERROR: " NORM
"Can not load PRQP request from \'"
BOLD BLUE "%s" NORM "\'\n\n",
diff -Naurp libpki-0.6.4/src/tools/pki-tool.c libpki-0.6.4.oden/src/tools/pki-tool.c
--- libpki-0.6.4/src/tools/pki-tool.c 2011-02-15 16:04:30.000000000 +0100
+++ libpki-0.6.4.oden/src/tools/pki-tool.c 2011-02-17 12:10:31.571024598 +0100
@@ -18,7 +18,7 @@ char * prompt_str( char * pt ) {
int k;
char c;
- fprintf(stderr, pt);
+ fprintf(stderr, "%s", pt);
memset(buf, 0, sizeof(buf));
for(i = 0 ; i < sizeof(buf); i++ ) {
