diff options
| author | David Benjamin <davidben@chromium.org> | 2014-07-21 00:23:51 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-07-25 01:18:38 +0400 |
| commit | cd9969434c2b2c347f1fb12623ee240ae01ac942 (patch) | |
| tree | af49bff13b6f72b2ec7547513d1073c4f8db27c0 /ssl/t1_lib.c | |
| parent | 060d9d2c563b3fbe00eff93e5033591504516e6c (diff) | |
Pass parameters to tls1_process_sigalgs as a CBS.
Slightly cleaner; it means we can use CBS_stow.
Change-Id: I074aa2d73a79648013dea025ee531beeea2af4a2
Reviewed-on: https://boringssl-review.googlesource.com/1287
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 2d673764..66add632 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1986,9 +1986,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, CBS *cbs, int *out_alert) return 0; } - if (!tls1_process_sigalgs(s, - CBS_data(&supported_signature_algorithms), - CBS_len(&supported_signature_algorithms))) + if (!tls1_process_sigalgs(s, &supported_signature_algorithms)) { *out_alert = SSL_AD_DECODE_ERROR; return 0; @@ -3177,30 +3175,26 @@ static int tls1_set_shared_sigalgs(SSL *s) /* Set preferred digest for each key type */ -int tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) +int tls1_process_sigalgs(SSL *s, const CBS *sigalgs) { int idx; size_t i; const EVP_MD *md; CERT *c = s->cert; TLS_SIGALGS *sigptr; + /* Extension ignored for inappropriate versions */ if (!SSL_USE_SIGALGS(s)) return 1; /* Length must be even */ - if (dsize % 2 != 0) + if (CBS_len(sigalgs) % 2 != 0) return 0; /* Should never happen */ if (!c) return 0; - if (c->peer_sigalgs) - OPENSSL_free(c->peer_sigalgs); - c->peer_sigalgs = OPENSSL_malloc(dsize); - if (!c->peer_sigalgs) + if (!CBS_stow(sigalgs, &c->peer_sigalgs, &c->peer_sigalgslen)) return 0; - c->peer_sigalgslen = dsize; - memcpy(c->peer_sigalgs, data, dsize); tls1_set_shared_sigalgs(s); |