diff options
Diffstat (limited to 'src/lib/libssl/src/apps/s_server.c')
| -rw-r--r-- | src/lib/libssl/src/apps/s_server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c index 497abf44ef..b03231f3ba 100644 --- a/src/lib/libssl/src/apps/s_server.c +++ b/src/lib/libssl/src/apps/s_server.c | |||
| @@ -320,10 +320,10 @@ static char **local_argv; | |||
| 320 | static int ebcdic_new(BIO *bi); | 320 | static int ebcdic_new(BIO *bi); |
| 321 | static int ebcdic_free(BIO *a); | 321 | static int ebcdic_free(BIO *a); |
| 322 | static int ebcdic_read(BIO *b, char *out, int outl); | 322 | static int ebcdic_read(BIO *b, char *out, int outl); |
| 323 | static int ebcdic_write(BIO *b, char *in, int inl); | 323 | static int ebcdic_write(BIO *b, const char *in, int inl); |
| 324 | static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr); | 324 | static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr); |
| 325 | static int ebcdic_gets(BIO *bp, char *buf, int size); | 325 | static int ebcdic_gets(BIO *bp, char *buf, int size); |
| 326 | static int ebcdic_puts(BIO *bp, char *str); | 326 | static int ebcdic_puts(BIO *bp, const char *str); |
| 327 | 327 | ||
| 328 | #define BIO_TYPE_EBCDIC_FILTER (18|0x0200) | 328 | #define BIO_TYPE_EBCDIC_FILTER (18|0x0200) |
| 329 | static BIO_METHOD methods_ebcdic= | 329 | static BIO_METHOD methods_ebcdic= |
| @@ -388,7 +388,7 @@ static int ebcdic_read(BIO *b, char *out, int outl) | |||
| 388 | return(ret); | 388 | return(ret); |
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | static int ebcdic_write(BIO *b, char *in, int inl) | 391 | static int ebcdic_write(BIO *b, const char *in, int inl) |
| 392 | { | 392 | { |
| 393 | EBCDIC_OUTBUFF *wbuf; | 393 | EBCDIC_OUTBUFF *wbuf; |
| 394 | int ret=0; | 394 | int ret=0; |
| @@ -421,7 +421,7 @@ static int ebcdic_write(BIO *b, char *in, int inl) | |||
| 421 | return(ret); | 421 | return(ret); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr) | 424 | static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr) |
| 425 | { | 425 | { |
| 426 | long ret; | 426 | long ret; |
| 427 | 427 | ||
| @@ -440,7 +440,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr) | |||
| 440 | 440 | ||
| 441 | static int ebcdic_gets(BIO *bp, char *buf, int size) | 441 | static int ebcdic_gets(BIO *bp, char *buf, int size) |
| 442 | { | 442 | { |
| 443 | int i, ret; | 443 | int i, ret=0; |
| 444 | if (bp->next_bio == NULL) return(0); | 444 | if (bp->next_bio == NULL) return(0); |
| 445 | /* return(BIO_gets(bp->next_bio,buf,size));*/ | 445 | /* return(BIO_gets(bp->next_bio,buf,size));*/ |
| 446 | for (i=0; i<size-1; ++i) | 446 | for (i=0; i<size-1; ++i) |
| @@ -459,7 +459,7 @@ static int ebcdic_gets(BIO *bp, char *buf, int size) | |||
| 459 | return (ret < 0 && i == 0) ? ret : i; | 459 | return (ret < 0 && i == 0) ? ret : i; |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | static int ebcdic_puts(BIO *bp, char *str) | 462 | static int ebcdic_puts(BIO *bp, const char *str) |
| 463 | { | 463 | { |
| 464 | if (bp->next_bio == NULL) return(0); | 464 | if (bp->next_bio == NULL) return(0); |
| 465 | return ebcdic_write(bp, str, strlen(str)); | 465 | return ebcdic_write(bp, str, strlen(str)); |
