kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Fix protos_len size in SSL_set_alpn_protos and SSL_CTX_set_alpn_protos"

Browse Source 
This reverts commit 35771ff8af. It breaks
tcnetty, which is tcnetty's fault but we have a large backlog from
Christmas to break with at the moment.

Bug: chromium:879657
Change-Id: Iafe93b335d88722170ec2689a25e145969e19e73
Reviewed-on: https://boringssl-review.googlesource.com/c/34324
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
This commit is contained in:
Adam Langley 2019-01-16 11:47:47 -08:00 committed by CQ bot account: commit-bot@chromium.org
parent 73b1f181b6
commit 823effe975
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/openssl/ssl.h
View File

@ -2658,7 +2658,7 @@ OPENSSL_EXPORT SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
// WARNING: this function is dangerous because it breaks the usual return value // WARNING: this function is dangerous because it breaks the usual return value
// convention. // convention.
OPENSSL_EXPORT int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const uint8_t *protos, OPENSSL_EXPORT int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const uint8_t *protos,
size_t protos_len); unsigned protos_len);
// SSL_set_alpn_protos sets the client ALPN protocol list on |ssl| to |protos|. // SSL_set_alpn_protos sets the client ALPN protocol list on |ssl| to |protos|.
// |protos| must be in wire-format (i.e. a series of non-empty, 8-bit // |protos| must be in wire-format (i.e. a series of non-empty, 8-bit
@ -2668,7 +2668,7 @@ OPENSSL_EXPORT int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const uint8_t *protos,
// WARNING: this function is dangerous because it breaks the usual return value // WARNING: this function is dangerous because it breaks the usual return value
// convention. // convention.
OPENSSL_EXPORT int SSL_set_alpn_protos(SSL *ssl, const uint8_t *protos, OPENSSL_EXPORT int SSL_set_alpn_protos(SSL *ssl, const uint8_t *protos,
size_t protos_len); unsigned protos_len);
// SSL_CTX_set_alpn_select_cb sets a callback function on |ctx| that is called // SSL_CTX_set_alpn_select_cb sets a callback function on |ctx| that is called
// during ClientHello processing in order to select an ALPN protocol from the // during ClientHello processing in order to select an ALPN protocol from the

4
ssl/ssl_lib.cc
View File

@ -2141,14 +2141,14 @@ void SSL_CTX_set_next_proto_select_cb(
} }
int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const uint8_t *protos, int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const uint8_t *protos,
size_t protos_len) { unsigned protos_len) {
// Note this function's calling convention is backwards. // Note this function's calling convention is backwards.
return ctx->alpn_client_proto_list.CopyFrom(MakeConstSpan(protos, protos_len)) return ctx->alpn_client_proto_list.CopyFrom(MakeConstSpan(protos, protos_len))
? 0 ? 0
: 1; : 1;
} }
int SSL_set_alpn_protos(SSL *ssl, const uint8_t *protos, size_t protos_len) { int SSL_set_alpn_protos(SSL *ssl, const uint8_t *protos, unsigned protos_len) {
// Note this function's calling convention is backwards. // Note this function's calling convention is backwards.
if (!ssl->config) { if (!ssl->config) {
return 1; return 1;