diff -Naurp libpki-0.4.1/src/tools/pki-query.c libpki-0.4.1.oden/src/tools/pki-query.c --- libpki-0.4.1/src/tools/pki-query.c 2009-11-14 03:56:26.000000000 +0100 +++ libpki-0.4.1.oden/src/tools/pki-query.c 2010-04-04 10:56:12.990433917 +0200 @@ -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.4.1/src/tools/pki-request.c libpki-0.4.1.oden/src/tools/pki-request.c --- libpki-0.4.1/src/tools/pki-request.c 2009-11-08 22:00:11.000000000 +0100 +++ libpki-0.4.1.oden/src/tools/pki-request.c 2010-04-04 10:59:27.559436633 +0200 @@ -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",