diff options
| author | David Benjamin <davidben@chromium.org> | 2014-11-23 23:47:20 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-12-02 22:35:15 +0300 |
| commit | cde8abae14da0cf7d7047974246df5f0ccf4ca4d (patch) | |
| tree | c348e410822c92f514babf5995c5cfac1ccb951b /ssl/d1_clnt.c | |
| parent | f34a0098341852db0e17ef3ac39f2ff2ee4a23ad (diff) | |
Merge client/server SSL_METHODs into the generic one.
Supporting both schemes seems pointless. Now that s->server and s->state are
set appropriately late and get_ssl_method is gone, the only difference is that
the client/server ones have non-functional ssl_accept or ssl_connect hooks. We
can't lose the generic ones, so let's unify on that.
Note: this means a static linker will no longer drop the client or server
handshake code if unused by a consumer linking statically. However, Chromium
needs the server half anyway for DTLS and WebRTC, so that's probably a lost
cause. Android also exposes server APIs.
Change-Id: I290f5fb4ed558f59fadb5d1f84e9d9c405004c23
Reviewed-on: https://boringssl-review.googlesource.com/2440
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/d1_clnt.c')
| -rw-r--r-- | ssl/d1_clnt.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c index 8d1cceb4..64c1775a 100644 --- a/ssl/d1_clnt.c +++ b/ssl/d1_clnt.c @@ -128,24 +128,6 @@ static int dtls1_get_hello_verify(SSL *s); -IMPLEMENT_dtls1_meth_func(DTLS1_VERSION, - DTLSv1_client_method, - ssl_undefined_function, - dtls1_connect, - DTLSv1_enc_data) - -IMPLEMENT_dtls1_meth_func(DTLS1_2_VERSION, - DTLSv1_2_client_method, - ssl_undefined_function, - dtls1_connect, - DTLSv1_2_enc_data) - -IMPLEMENT_dtls1_meth_func(DTLS_ANY_VERSION, - DTLS_client_method, - ssl_undefined_function, - dtls1_connect, - DTLSv1_2_enc_data) - int dtls1_connect(SSL *s) { BUF_MEM *buf=NULL; |