projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from 1.0.0-stable
[openssl.git]
/
apps
/
s_cb.c
diff --git
a/apps/s_cb.c
b/apps/s_cb.c
index 95860d208f754377e634d8d9ad96b88c93be03e3..3fc73a27aa770c2b358f1e28056353a3a0936eed 100644
(file)
--- a/
apps/s_cb.c
+++ b/
apps/s_cb.c
@@
-260,7
+260,7
@@
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
}
long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
}
long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
-
size_
t argi, long argl, long ret)
+
in
t argi, long argl, long ret)
{
BIO *out;
{
BIO *out;
@@
-269,15
+269,15
@@
long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
{
if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
{
- BIO_printf(out,"read from %p [%p] (%
d
bytes => %ld (0x%lX))\n",
- (void *)bio,argp,argi,ret,ret);
+ BIO_printf(out,"read from %p [%p] (%
lu
bytes => %ld (0x%lX))\n",
+ (void *)bio,argp,
(unsigned long)
argi,ret,ret);
BIO_dump(out,argp,(int)ret);
return(ret);
}
else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
{
BIO_dump(out,argp,(int)ret);
return(ret);
}
else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
{
- BIO_printf(out,"write to %p [%p] (%
d
bytes => %ld (0x%lX))\n",
- (void *)bio,argp,argi,ret,ret);
+ BIO_printf(out,"write to %p [%p] (%
lu
bytes => %ld (0x%lX))\n",
+ (void *)bio,argp,
(unsigned long)
argi,ret,ret);
BIO_dump(out,argp,(int)ret);
}
return(ret);
BIO_dump(out,argp,(int)ret);
}
return(ret);
@@
-338,6
+338,12
@@
void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
case TLS1_VERSION:
str_version = "TLS 1.0 ";
break;
case TLS1_VERSION:
str_version = "TLS 1.0 ";
break;
+ case DTLS1_VERSION:
+ str_version = "DTLS 1.0 ";
+ break;
+ case DTLS1_BAD_VER:
+ str_version = "DTLS 1.0 (bad) ";
+ break;
default:
str_version = "???";
}
default:
str_version = "???";
}
@@
-403,7
+409,10
@@
void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
}
}
}
}
- if (version == SSL3_VERSION || version == TLS1_VERSION)
+ if (version == SSL3_VERSION ||
+ version == TLS1_VERSION ||
+ version == DTLS1_VERSION ||
+ version == DTLS1_BAD_VER)
{
switch (content_type)
{
{
switch (content_type)
{
@@
-542,6
+551,9
@@
void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
case 2:
str_details1 = ", ServerHello";
break;
case 2:
str_details1 = ", ServerHello";
break;
+ case 3:
+ str_details1 = ", HelloVerifyRequest";
+ break;
case 11:
str_details1 = ", Certificate";
break;
case 11:
str_details1 = ", Certificate";
break;