summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bio
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/bio')
-rw-r--r--src/lib/libcrypto/bio/b_dump.c10
-rw-r--r--src/lib/libcrypto/bio/b_sock.c4
-rw-r--r--src/lib/libcrypto/bio/bio_cb.c30
-rw-r--r--src/lib/libcrypto/bio/bss_conn.c4
4 files changed, 24 insertions, 24 deletions
diff --git a/src/lib/libcrypto/bio/b_dump.c b/src/lib/libcrypto/bio/b_dump.c
index c80ecc4295..492ee09275 100644
--- a/src/lib/libcrypto/bio/b_dump.c
+++ b/src/lib/libcrypto/bio/b_dump.c
@@ -107,7 +107,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
107 { 107 {
108 buf[0]='\0'; /* start with empty string */ 108 buf[0]='\0'; /* start with empty string */
109 BUF_strlcpy(buf,str,sizeof buf); 109 BUF_strlcpy(buf,str,sizeof buf);
110 BIO_snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width); 110 (void) snprintf(tmp,sizeof tmp,"%04x - ",i*dump_width);
111 BUF_strlcat(buf,tmp,sizeof buf); 111 BUF_strlcat(buf,tmp,sizeof buf);
112 for(j=0;j<dump_width;j++) 112 for(j=0;j<dump_width;j++)
113 { 113 {
@@ -118,7 +118,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
118 else 118 else
119 { 119 {
120 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff; 120 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
121 BIO_snprintf(tmp,sizeof tmp,"%02x%c",ch, 121 (void) snprintf(tmp,sizeof tmp,"%02x%c",ch,
122 j==7?'-':' '); 122 j==7?'-':' ');
123 BUF_strlcat(buf,tmp,sizeof buf); 123 BUF_strlcat(buf,tmp,sizeof buf);
124 } 124 }
@@ -130,10 +130,10 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
130 break; 130 break;
131 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff; 131 ch=((unsigned char)*(s+i*dump_width+j)) & 0xff;
132#ifndef CHARSET_EBCDIC 132#ifndef CHARSET_EBCDIC
133 BIO_snprintf(tmp,sizeof tmp,"%c", 133 (void) snprintf(tmp,sizeof tmp,"%c",
134 ((ch>=' ')&&(ch<='~'))?ch:'.'); 134 ((ch>=' ')&&(ch<='~'))?ch:'.');
135#else 135#else
136 BIO_snprintf(tmp,sizeof tmp,"%c", 136 (void) snprintf(tmp,sizeof tmp,"%c",
137 ((ch>=os_toascii[' '])&&(ch<=os_toascii['~'])) 137 ((ch>=os_toascii[' '])&&(ch<=os_toascii['~']))
138 ? os_toebcdic[ch] 138 ? os_toebcdic[ch]
139 : '.'); 139 : '.');
@@ -149,7 +149,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
149#ifdef TRUNCATE 149#ifdef TRUNCATE
150 if (trc > 0) 150 if (trc > 0)
151 { 151 {
152 BIO_snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str, 152 (void) snprintf(buf,sizeof buf,"%s%04x - <SPACES/NULS>\n",str,
153 len+trc); 153 len+trc);
154 ret+=cb((void *)buf,strlen(buf),u); 154 ret+=cb((void *)buf,strlen(buf),u);
155 } 155 }
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 779acbaaf5..bd43307456 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -916,7 +916,7 @@ int BIO_accept(int sock, char **addr)
916 goto end; 916 goto end;
917 } 917 }
918 *addr = p; 918 *addr = p;
919 BIO_snprintf(*addr,nl,"%s:%s",h,s); 919 (void) snprintf(*addr,nl,"%s:%s",h,s);
920 goto end; 920 goto end;
921 } while(0); 921 } while(0);
922#endif 922#endif
@@ -932,7 +932,7 @@ int BIO_accept(int sock, char **addr)
932 } 932 }
933 *addr=p; 933 *addr=p;
934 } 934 }
935 BIO_snprintf(*addr,24,"%d.%d.%d.%d:%d", 935 (void) snprintf(*addr,24,"%d.%d.%d.%d:%d",
936 (unsigned char)(l>>24L)&0xff, 936 (unsigned char)(l>>24L)&0xff,
937 (unsigned char)(l>>16L)&0xff, 937 (unsigned char)(l>>16L)&0xff,
938 (unsigned char)(l>> 8L)&0xff, 938 (unsigned char)(l>> 8L)&0xff,
diff --git a/src/lib/libcrypto/bio/bio_cb.c b/src/lib/libcrypto/bio/bio_cb.c
index 7334a254bf..78c8974ab4 100644
--- a/src/lib/libcrypto/bio/bio_cb.c
+++ b/src/lib/libcrypto/bio/bio_cb.c
@@ -75,60 +75,60 @@ long BIO_debug_callback(BIO *bio, int cmd, const char *argp,
75 if (BIO_CB_RETURN & cmd) 75 if (BIO_CB_RETURN & cmd)
76 r=ret; 76 r=ret;
77 77
78 BIO_snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio); 78 (void) snprintf(buf,sizeof buf,"BIO[%08lX]:",(unsigned long)bio);
79 p= &(buf[14]); 79 p= &(buf[14]);
80 p_maxlen = sizeof buf - 14; 80 p_maxlen = sizeof buf - 14;
81 switch (cmd) 81 switch (cmd)
82 { 82 {
83 case BIO_CB_FREE: 83 case BIO_CB_FREE:
84 BIO_snprintf(p,p_maxlen,"Free - %s\n",bio->method->name); 84 (void) snprintf(p,p_maxlen,"Free - %s\n",bio->method->name);
85 break; 85 break;
86 case BIO_CB_READ: 86 case BIO_CB_READ:
87 if (bio->method->type & BIO_TYPE_DESCRIPTOR) 87 if (bio->method->type & BIO_TYPE_DESCRIPTOR)
88 BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n", 88 (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s fd=%d\n",
89 bio->num,(unsigned long)argi, 89 bio->num,(unsigned long)argi,
90 bio->method->name,bio->num); 90 bio->method->name,bio->num);
91 else 91 else
92 BIO_snprintf(p,p_maxlen,"read(%d,%lu) - %s\n", 92 (void) snprintf(p,p_maxlen,"read(%d,%lu) - %s\n",
93 bio->num,(unsigned long)argi, 93 bio->num,(unsigned long)argi,
94 bio->method->name); 94 bio->method->name);
95 break; 95 break;
96 case BIO_CB_WRITE: 96 case BIO_CB_WRITE:
97 if (bio->method->type & BIO_TYPE_DESCRIPTOR) 97 if (bio->method->type & BIO_TYPE_DESCRIPTOR)
98 BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n", 98 (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s fd=%d\n",
99 bio->num,(unsigned long)argi, 99 bio->num,(unsigned long)argi,
100 bio->method->name,bio->num); 100 bio->method->name,bio->num);
101 else 101 else
102 BIO_snprintf(p,p_maxlen,"write(%d,%lu) - %s\n", 102 (void) snprintf(p,p_maxlen,"write(%d,%lu) - %s\n",
103 bio->num,(unsigned long)argi, 103 bio->num,(unsigned long)argi,
104 bio->method->name); 104 bio->method->name);
105 break; 105 break;
106 case BIO_CB_PUTS: 106 case BIO_CB_PUTS:
107 BIO_snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name); 107 (void) snprintf(p,p_maxlen,"puts() - %s\n",bio->method->name);
108 break; 108 break;
109 case BIO_CB_GETS: 109 case BIO_CB_GETS:
110 BIO_snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name); 110 (void) snprintf(p,p_maxlen,"gets(%lu) - %s\n",(unsigned long)argi,bio->method->name);
111 break; 111 break;
112 case BIO_CB_CTRL: 112 case BIO_CB_CTRL:
113 BIO_snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name); 113 (void) snprintf(p,p_maxlen,"ctrl(%lu) - %s\n",(unsigned long)argi,bio->method->name);
114 break; 114 break;
115 case BIO_CB_RETURN|BIO_CB_READ: 115 case BIO_CB_RETURN|BIO_CB_READ:
116 BIO_snprintf(p,p_maxlen,"read return %ld\n",ret); 116 (void) snprintf(p,p_maxlen,"read return %ld\n",ret);
117 break; 117 break;
118 case BIO_CB_RETURN|BIO_CB_WRITE: 118 case BIO_CB_RETURN|BIO_CB_WRITE:
119 BIO_snprintf(p,p_maxlen,"write return %ld\n",ret); 119 (void) snprintf(p,p_maxlen,"write return %ld\n",ret);
120 break; 120 break;
121 case BIO_CB_RETURN|BIO_CB_GETS: 121 case BIO_CB_RETURN|BIO_CB_GETS:
122 BIO_snprintf(p,p_maxlen,"gets return %ld\n",ret); 122 (void) snprintf(p,p_maxlen,"gets return %ld\n",ret);
123 break; 123 break;
124 case BIO_CB_RETURN|BIO_CB_PUTS: 124 case BIO_CB_RETURN|BIO_CB_PUTS:
125 BIO_snprintf(p,p_maxlen,"puts return %ld\n",ret); 125 (void) snprintf(p,p_maxlen,"puts return %ld\n",ret);
126 break; 126 break;
127 case BIO_CB_RETURN|BIO_CB_CTRL: 127 case BIO_CB_RETURN|BIO_CB_CTRL:
128 BIO_snprintf(p,p_maxlen,"ctrl return %ld\n",ret); 128 (void) snprintf(p,p_maxlen,"ctrl return %ld\n",ret);
129 break; 129 break;
130 default: 130 default:
131 BIO_snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd); 131 (void) snprintf(p,p_maxlen,"bio callback - unknown type (%d)\n",cmd);
132 break; 132 break;
133 } 133 }
134 134
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 42ddf1f4aa..5162e75c87 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -521,7 +521,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
521 char buf[16]; 521 char buf[16];
522 unsigned char *p = ptr; 522 unsigned char *p = ptr;
523 523
524 BIO_snprintf(buf,sizeof buf,"%d.%d.%d.%d", 524 (void) snprintf(buf,sizeof buf,"%d.%d.%d.%d",
525 p[0],p[1],p[2],p[3]); 525 p[0],p[1],p[2],p[3]);
526 if (data->param_hostname != NULL) 526 if (data->param_hostname != NULL)
527 OPENSSL_free(data->param_hostname); 527 OPENSSL_free(data->param_hostname);
@@ -532,7 +532,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
532 { 532 {
533 char buf[DECIMAL_SIZE(int)+1]; 533 char buf[DECIMAL_SIZE(int)+1];
534 534
535 BIO_snprintf(buf,sizeof buf,"%d",*(int *)ptr); 535 (void) snprintf(buf,sizeof buf,"%d",*(int *)ptr);
536 if (data->param_port != NULL) 536 if (data->param_port != NULL)
537 OPENSSL_free(data->param_port); 537 OPENSSL_free(data->param_port);
538 data->param_port=BUF_strdup(buf); 538 data->param_port=BUF_strdup(buf);