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/s3_lib.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/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 059f6952..ad09cd25 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -1412,8 +1412,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) break; case SSL_CTRL_GET_CHANNEL_ID: - if (!s->server) - break; if (!s->s3->tlsext_channel_id_valid) break; memcpy(parg, s->s3->tlsext_channel_id, larg < 64 ? larg : 64); @@ -1666,9 +1664,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) return ssl_cert_select_current(ctx->cert, (X509 *)parg); case SSL_CTRL_CHANNEL_ID: - /* must be called on a server */ - if (ctx->method->ssl_accept == ssl_undefined_function) - return 0; ctx->tlsext_channel_id_enabled=1; return 1; |