generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid warnings.

Browse Source
This commit is contained in:
Bodo Möller 1999-06-10 16:29:32 +00:00
parent 9d9b559ef0
commit d58d092bc9
21 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/ca.c
View File

@ -866,7 +866,7 @@ bad:
if (!batch) if (!batch)
{ {
BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total); BIO_printf(bio_err,"\n%d out of %d certificate requests certified, commit? [y/n]",total_done,total);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
buf[0][0]='\0'; buf[0][0]='\0';
fgets(buf[0],10,stdin); fgets(buf[0],10,stdin);
if ((buf[0][0] != 'y') && (buf[0][0] != 'Y')) if ((buf[0][0] != 'y') && (buf[0][0] != 'Y'))
@ -1067,7 +1067,7 @@ bad:
strlen(pp[DB_rev_date])); strlen(pp[DB_rev_date]));
/* strcpy(r->revocationDate,pp[DB_rev_date]);*/ /* strcpy(r->revocationDate,pp[DB_rev_date]);*/
BIO_reset(hex); (void)BIO_reset(hex);
if (!BIO_puts(hex,pp[DB_serial])) if (!BIO_puts(hex,pp[DB_serial]))
goto err; goto err;
if (!a2i_ASN1_INTEGER(hex,r->serialNumber, if (!a2i_ASN1_INTEGER(hex,r->serialNumber,
@ -1791,7 +1791,7 @@ again2:
if (!batch) if (!batch)
{ {
BIO_printf(bio_err,"Sign the certificate? [y/n]:"); BIO_printf(bio_err,"Sign the certificate? [y/n]:");
BIO_flush(bio_err); (void)BIO_flush(bio_err);
buf[0]='\0'; buf[0]='\0';
fgets(buf,sizeof(buf)-1,stdin); fgets(buf,sizeof(buf)-1,stdin);
if (!((buf[0] == 'y') || (buf[0] == 'Y'))) if (!((buf[0] == 'y') || (buf[0] == 'Y')))

2
apps/dgst.c
View File

@ -182,7 +182,7 @@ int MAIN(int argc, char **argv)
} }
printf("%s(%s)= ",name,argv[i]); printf("%s(%s)= ",name,argv[i]);
do_fp(buf,inp,separator); do_fp(buf,inp,separator);
BIO_reset(bmd); (void)BIO_reset(bmd);
} }
} }
end: end:

2
apps/dsaparam.c
View File

@ -345,7 +345,7 @@ static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
if (p == 2) c='*'; if (p == 2) c='*';
if (p == 3) c='\n'; if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1); BIO_write((BIO *)arg,&c,1);
BIO_flush((BIO *)arg); (void)BIO_flush((BIO *)arg);
#ifdef LINT #ifdef LINT
p=n; p=n;
#endif #endif

2
apps/gendh.c
View File

@ -193,7 +193,7 @@ static void MS_CALLBACK dh_cb(int p, int n, void *arg)
if (p == 2) c='*'; if (p == 2) c='*';
if (p == 3) c='\n'; if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1); BIO_write((BIO *)arg,&c,1);
BIO_flush((BIO *)arg); (void)BIO_flush((BIO *)arg);
#ifdef LINT #ifdef LINT
p=n; p=n;
#endif #endif

2
apps/genrsa.c
View File

@ -236,7 +236,7 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
if (p == 2) c='*'; if (p == 2) c='*';
if (p == 3) c='\n'; if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1); BIO_write((BIO *)arg,&c,1);
BIO_flush((BIO *)arg); (void)BIO_flush((BIO *)arg);
#ifdef LINT #ifdef LINT
p=n; p=n;
#endif #endif

2
apps/openssl.c
View File

@ -219,7 +219,7 @@ int main(int Argc, char *Argv[])
} }
if (ret != 0) if (ret != 0)
BIO_printf(bio_err,"error in %s\n",argv[0]); BIO_printf(bio_err,"error in %s\n",argv[0]);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
} }
BIO_printf(bio_err,"bad exit\n"); BIO_printf(bio_err,"bad exit\n");
ret=1; ret=1;

2
apps/pkcs12.c
View File

@ -293,7 +293,7 @@ if (export_cert) {
unsigned int keyidlen; unsigned int keyidlen;
/* Get private key so we can match it to a certificate */ /* Get private key so we can match it to a certificate */
key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL); key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL);
if (!inkey) BIO_reset(in); if (!inkey) (void)BIO_reset(in);
if (!key) { if (!key) {
BIO_printf (bio_err, "Error loading private key\n"); BIO_printf (bio_err, "Error loading private key\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);

8
apps/req.c
View File

@ -245,7 +245,7 @@ int MAIN(int argc, char **argv)
if ((dsa_params=PEM_read_bio_DSAparams(in,NULL,NULL)) == NULL) if ((dsa_params=PEM_read_bio_DSAparams(in,NULL,NULL)) == NULL)
{ {
ERR_clear_error(); ERR_clear_error();
BIO_reset(in); (void)BIO_reset(in);
if ((xtmp=PEM_read_bio_X509(in,NULL,NULL)) == NULL) if ((xtmp=PEM_read_bio_X509(in,NULL,NULL)) == NULL)
{ {
BIO_printf(bio_err,"unable to load DSA parameters from file\n"); BIO_printf(bio_err,"unable to load DSA parameters from file\n");
@ -979,7 +979,7 @@ static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
MS_STATIC char buf[1024]; MS_STATIC char buf[1024];
BIO_printf(bio_err,"%s [%s]:",text,def); BIO_printf(bio_err,"%s [%s]:",text,def);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
if (value != NULL) if (value != NULL)
{ {
strcpy(buf,value); strcpy(buf,value);
@ -1040,7 +1040,7 @@ static int add_attribute_object(STACK_OF(X509_ATTRIBUTE) *n, char *text,
start: start:
BIO_printf(bio_err,"%s [%s]:",text,def); BIO_printf(bio_err,"%s [%s]:",text,def);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
if (value != NULL) if (value != NULL)
{ {
strcpy(buf,value); strcpy(buf,value);
@ -1123,7 +1123,7 @@ static void MS_CALLBACK req_cb(int p, int n, void *arg)
if (p == 2) c='*'; if (p == 2) c='*';
if (p == 3) c='\n'; if (p == 3) c='\n';
BIO_write((BIO *)arg,&c,1); BIO_write((BIO *)arg,&c,1);
BIO_flush((BIO *)arg); (void)BIO_flush((BIO *)arg);
#ifdef LINT #ifdef LINT
p=n; p=n;
#endif #endif

6
apps/s_server.c
View File

@ -631,7 +631,7 @@ bad:
BIO_printf(bio_s_out,"Using default temp DH parameters\n"); BIO_printf(bio_s_out,"Using default temp DH parameters\n");
dh=get_dh512(); dh=get_dh512();
} }
BIO_flush(bio_s_out); (void)BIO_flush(bio_s_out);
SSL_CTX_set_tmp_dh(ctx,dh); SSL_CTX_set_tmp_dh(ctx,dh);
DH_free(dh); DH_free(dh);
@ -1403,13 +1403,13 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
if (!s_quiet) if (!s_quiet)
{ {
BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength); BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
} }
rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL); rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL);
if (!s_quiet) if (!s_quiet)
{ {
BIO_printf(bio_err,"\n"); BIO_printf(bio_err,"\n");
BIO_flush(bio_err); (void)BIO_flush(bio_err);
} }
} }
return(rsa_tmp); return(rsa_tmp);

2
apps/s_socket.c
View File

@ -494,7 +494,7 @@ int host_ip(char *str, unsigned char ip[4])
unsigned int in[4]; unsigned int in[4];
int i; int i;
if (sscanf(str,"%d.%d.%d.%d",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4) if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)
{ {
for (i=0; i<4; i++) for (i=0; i<4; i++)
if (in[i] > 255) if (in[i] > 255)

12
apps/speed.c
View File

@ -1130,7 +1130,7 @@ int MAIN(int argc, char **argv)
printf("%18ssign verify sign/s verify/s\n"," "); printf("%18ssign verify sign/s verify/s\n"," ");
j=0; j=0;
} }
fprintf(stdout,"rsa %4d bits %8.4fs %8.4fs %8.1f %8.1f", fprintf(stdout,"rsa %4u bits %8.4fs %8.4fs %8.1f %8.1f",
rsa_bits[k],rsa_results[k][0],rsa_results[k][1], rsa_bits[k],rsa_results[k][0],rsa_results[k][1],
1.0/rsa_results[k][0],1.0/rsa_results[k][1]); 1.0/rsa_results[k][0],1.0/rsa_results[k][1]);
fprintf(stdout,"\n"); fprintf(stdout,"\n");
@ -1145,7 +1145,7 @@ int MAIN(int argc, char **argv)
printf("%18ssign verify sign/s verify/s\n"," "); printf("%18ssign verify sign/s verify/s\n"," ");
j=0; j=0;
} }
fprintf(stdout,"dsa %4d bits %8.4fs %8.4fs %8.1f %8.1f", fprintf(stdout,"dsa %4u bits %8.4fs %8.4fs %8.1f %8.1f",
dsa_bits[k],dsa_results[k][0],dsa_results[k][1], dsa_bits[k],dsa_results[k][0],dsa_results[k][1],
1.0/dsa_results[k][0],1.0/dsa_results[k][1]); 1.0/dsa_results[k][0],1.0/dsa_results[k][1]);
fprintf(stdout,"\n"); fprintf(stdout,"\n");
@ -1172,11 +1172,11 @@ static void print_message(char *s, long num, int length)
{ {
#ifdef SIGALRM #ifdef SIGALRM
BIO_printf(bio_err,"Doing %s for %ds on %d size blocks: ",s,SECONDS,length); BIO_printf(bio_err,"Doing %s for %ds on %d size blocks: ",s,SECONDS,length);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
alarm(SECONDS); alarm(SECONDS);
#else #else
BIO_printf(bio_err,"Doing %s %ld times on %d size blocks: ",s,num,length); BIO_printf(bio_err,"Doing %s %ld times on %d size blocks: ",s,num,length);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
#endif #endif
#ifdef LINT #ifdef LINT
num=num; num=num;
@ -1188,11 +1188,11 @@ static void pkey_print_message(char *str, char *str2, long num, int bits,
{ {
#ifdef SIGALRM #ifdef SIGALRM
BIO_printf(bio_err,"Doing %d bit %s %s's for %ds: ",bits,str,str2,tm); BIO_printf(bio_err,"Doing %d bit %s %s's for %ds: ",bits,str,str2,tm);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
alarm(RSA_SECONDS); alarm(RSA_SECONDS);
#else #else
BIO_printf(bio_err,"Doing %ld %d bit %s %s's: ",num,bits,str,str2); BIO_printf(bio_err,"Doing %ld %d bit %s %s's: ",num,bits,str,str2);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
#endif #endif
#ifdef LINT #ifdef LINT
num=num; num=num;

4
crypto/asn1/a_object.c
View File

@ -206,7 +206,7 @@ int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
if (i > 2) i=2; if (i > 2) i=2;
l-=(long)(i*40); l-=(long)(i*40);
sprintf(tbuf,"%d.%ld",i,l); sprintf(tbuf,"%d.%lu",i,l);
i=strlen(tbuf); i=strlen(tbuf);
strncpy(buf,tbuf,buf_len); strncpy(buf,tbuf,buf_len);
buf_len-=i; buf_len-=i;
@ -219,7 +219,7 @@ int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a)
l|=p[idx]&0x7f; l|=p[idx]&0x7f;
if (!(p[idx] & 0x80)) if (!(p[idx] & 0x80))
{ {
sprintf(tbuf,".%ld",l); sprintf(tbuf,".%lu",l);
i=strlen(tbuf); i=strlen(tbuf);
if (buf_len > 0) if (buf_len > 0)
strncpy(buf,tbuf,buf_len); strncpy(buf,tbuf,buf_len);

2
crypto/bf/bftest.c
View File

@ -308,7 +308,7 @@ static int print_test_data(void)
printf("c="); printf("c=");
for (j=0; j<8; j++) for (j=0; j<8; j++)
printf("%02X",key_out[i][j]); printf("%02X",key_out[i][j]);
printf(" k[%2d]=",i+1); printf(" k[%2u]=",i+1);
for (j=0; j<i+1; j++) for (j=0; j<i+1; j++)
printf("%02X",key_test[j]); printf("%02X",key_test[j]);
printf("\n"); printf("\n");

1
crypto/bio/bss_bio.c
View File

@ -9,6 +9,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/err.h> #include <openssl/err.h>

2
crypto/bio/bss_conn.c
View File

@ -570,7 +570,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, char *ptr)
if (data->param_hostname) if (data->param_hostname)
BIO_set_conn_hostname(dbio,data->param_hostname); BIO_set_conn_hostname(dbio,data->param_hostname);
BIO_set_nbio(dbio,data->nbio); BIO_set_nbio(dbio,data->nbio);
BIO_set_info_callback(dbio,data->info_callback); (void)BIO_set_info_callback(dbio,data->info_callback);
break; break;
case BIO_CTRL_SET_CALLBACK: case BIO_CTRL_SET_CALLBACK:
data->info_callback=(int (*)())ptr; data->info_callback=(int (*)())ptr;

4
crypto/mem.c
View File

@ -308,8 +308,8 @@ static void print_leak(MEM *m, MEM_LEAK *l)
if(m->addr == (char *)l->bio) if(m->addr == (char *)l->bio)
return; return;
sprintf(buf,"%5ld file=%s, line=%d, number=%d, address=%08lX\n", sprintf(buf,"%5lu file=%s, line=%d, number=%d, address=%08lX\n",
m->order,m->file,m->line,m->num,(long)m->addr); m->order,m->file,m->line,m->num,(unsigned long)m->addr);
BIO_puts(l->bio,buf); BIO_puts(l->bio,buf);
l->chunks++; l->chunks++;
l->bytes+=m->num; l->bytes+=m->num;

18
crypto/rand/randtest.c
View File

@ -117,7 +117,7 @@ int main()
/* test 1 */ /* test 1 */
if (!((9654 < n1) && (n1 < 10346))) if (!((9654 < n1) && (n1 < 10346)))
{ {
printf("test 1 failed, X=%ld\n",n1); printf("test 1 failed, X=%lu\n",n1);
err++; err++;
} }
printf("test 1 done\n"); printf("test 1 done\n");
@ -150,37 +150,37 @@ int main()
{ {
if (!((2267 < runs[i][0]) && (runs[i][0] < 2733))) if (!((2267 < runs[i][0]) && (runs[i][0] < 2733)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,1,runs[i][0]); i,1,runs[i][0]);
err++; err++;
} }
if (!((1079 < runs[i][1]) && (runs[i][1] < 1421))) if (!((1079 < runs[i][1]) && (runs[i][1] < 1421)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,2,runs[i][1]); i,2,runs[i][1]);
err++; err++;
} }
if (!(( 502 < runs[i][2]) && (runs[i][2] < 748))) if (!(( 502 < runs[i][2]) && (runs[i][2] < 748)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,3,runs[i][2]); i,3,runs[i][2]);
err++; err++;
} }
if (!(( 223 < runs[i][3]) && (runs[i][3] < 402))) if (!(( 223 < runs[i][3]) && (runs[i][3] < 402)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,4,runs[i][3]); i,4,runs[i][3]);
err++; err++;
} }
if (!(( 90 < runs[i][4]) && (runs[i][4] < 223))) if (!(( 90 < runs[i][4]) && (runs[i][4] < 223)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,5,runs[i][4]); i,5,runs[i][4]);
err++; err++;
} }
if (!(( 90 < runs[i][5]) && (runs[i][5] < 223))) if (!(( 90 < runs[i][5]) && (runs[i][5] < 223)))
{ {
printf("test 3 failed, bit=%d run=%d num=%ld\n", printf("test 3 failed, bit=%d run=%d num=%lu\n",
i,6,runs[i][5]); i,6,runs[i][5]);
err++; err++;
} }
@ -190,13 +190,13 @@ int main()
/* test 4 */ /* test 4 */
if (runs[0][33] != 0) if (runs[0][33] != 0)
{ {
printf("test 4 failed, bit=%d run=%d num=%ld\n", printf("test 4 failed, bit=%d run=%d num=%lu\n",
0,34,runs[0][33]); 0,34,runs[0][33]);
err++; err++;
} }
if (runs[1][33] != 0) if (runs[1][33] != 0)
{ {
printf("test 4 failed, bit=%d run=%d num=%ld\n", printf("test 4 failed, bit=%d run=%d num=%lu\n",
1,34,runs[1][33]); 1,34,runs[1][33]);
err++; err++;
} }

2
ssl/s23_clnt.c
View File

@ -186,7 +186,7 @@ int ssl23_connect(SSL *s)
/* break; */ /* break; */
} }
if (s->debug) BIO_flush(s->wbio); if (s->debug) { (void)BIO_flush(s->wbio); }
if ((cb != NULL) && (s->state != state)) if ((cb != NULL) && (s->state != state))
{ {

2
ssl/s3_pkt.c
View File

@ -1016,7 +1016,7 @@ int ssl3_dispatch_alert(SSL *s)
* does not get sent due to non-blocking IO, we will * does not get sent due to non-blocking IO, we will
* not worry too much. */ * not worry too much. */
if (s->s3->send_alert[0] == SSL3_AL_FATAL) if (s->s3->send_alert[0] == SSL3_AL_FATAL)
BIO_flush(s->wbio); (void)BIO_flush(s->wbio);
if (s->info_callback != NULL) if (s->info_callback != NULL)
cb=s->info_callback; cb=s->info_callback;

2
ssl/ssl_lib.c
View File

@ -1695,7 +1695,7 @@ int ssl_init_wbio_buffer(SSL *s,int push)
if (s->bbio == s->wbio) if (s->bbio == s->wbio)
s->wbio=BIO_pop(s->wbio); s->wbio=BIO_pop(s->wbio);
} }
BIO_reset(bbio); (void)BIO_reset(bbio);
/* if (!BIO_set_write_buffer_size(bbio,16*1024)) */ /* if (!BIO_set_write_buffer_size(bbio,16*1024)) */
if (!BIO_set_read_buffer_size(bbio,1)) if (!BIO_set_read_buffer_size(bbio,1))
{ {

7
ssl/ssltest.c
View File

@ -97,9 +97,12 @@ BIO *bio_stdout=NULL;
static char *cipher=NULL; static char *cipher=NULL;
int verbose=0; int verbose=0;
int debug=0; int debug=0;
#if 0
/* Not used yet. */
#ifdef FIONBIO #ifdef FIONBIO
static int s_nbio=0; static int s_nbio=0;
#endif #endif
#endif
int doit(SSL *s_ssl,SSL *c_ssl,long bytes); int doit(SSL *s_ssl,SSL *c_ssl,long bytes);
@ -731,10 +734,10 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
if (rsa_tmp == NULL) if (rsa_tmp == NULL)
{ {
BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength); BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
BIO_flush(bio_err); (void)BIO_flush(bio_err);
rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL); rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL);
BIO_printf(bio_err,"\n"); BIO_printf(bio_err,"\n");
BIO_flush(bio_err); (void)BIO_flush(bio_err);
} }
return(rsa_tmp); return(rsa_tmp);
} }