projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apps/*.c: switch to platform-neutral format modifiers in BIO_print calls.
[openssl.git]
/
apps
/
s_client.c
diff --git
a/apps/s_client.c
b/apps/s_client.c
index 67e9a925726ec89aa035c7f11af747a15d25dd00..cab7e251de2a8c5fea25fb50d7849585454177cb 100644
(file)
--- a/
apps/s_client.c
+++ b/
apps/s_client.c
@@
-2403,7
+2403,7
@@
int s_client_main(int argc, char **argv)
else
timeoutp = NULL;
else
timeoutp = NULL;
- if (
SSL_in_init(con) && !SSL_total_renegotiations(con)
+ if (
!SSL_is_init_finished(con) && SSL_total_renegotiations(con) == 0
&& SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
in_init = 1;
tty_on = 0;
&& SSL_get_key_update_type(con) == SSL_KEY_UPDATE_NONE) {
in_init = 1;
tty_on = 0;
@@
-2901,8
+2901,8
@@
static void print_stuff(BIO *bio, SSL *s, int full)
#endif
BIO_printf(bio,
#endif
BIO_printf(bio,
- "---\nSSL handshake has read %
" PRIu64
- "
bytes and written %" PRIu64 "
bytes\n",
+ "---\nSSL handshake has read %
ju bytes "
+ "
and written %ju
bytes\n",
BIO_number_read(SSL_get_rbio(s)),
BIO_number_written(SSL_get_wbio(s)));
}
BIO_number_read(SSL_get_rbio(s)),
BIO_number_written(SSL_get_wbio(s)));
}