summaryrefslogtreecommitdiffstats
path: root/apps/s_socket.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-03-20 16:49:14 +0100
committerDr. Stephen Henson <steve@openssl.org>2013-03-26 16:16:41 +0100
commitc3b344e36a088283731b4f65a70e85b100f55686 (patch)
tree27000a39428849e76799f34288bd4490a073b2a7 /apps/s_socket.c
parentRemove versions test from dtls1_buffer_message (diff)
downloadopenssl-c3b344e36a088283731b4f65a70e85b100f55686.tar.xz
openssl-c3b344e36a088283731b4f65a70e85b100f55686.zip
Provisional DTLS 1.2 support.
Add correct flags for DTLS 1.2, update s_server and s_client to handle DTLS 1.2 methods. Currently no support for version negotiation: i.e. if client/server selects DTLS 1.2 it is that or nothing.
Diffstat (limited to 'apps/s_socket.c')
-rw-r--r--apps/s_socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_socket.c b/apps/s_socket.c
index d83eecb6de..a04b990540 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -280,7 +280,7 @@ static int init_client_ip(int *sock, const unsigned char ip[4], int port,
return(1);
}
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context, int naccept)
+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept)
{
int sock;
char *name = NULL;
@@ -310,7 +310,7 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns
}
else
sock = accept_socket;
- i=(*cb)(name,sock, context);
+ i=(*cb)(name,sock, type, context);
if (name != NULL) OPENSSL_free(name);
if (type==SOCK_STREAM)
SHUTDOWN2(sock);