diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-11 01:10:42 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-11 01:10:42 +0000 |
| commit | e4f3aecf84380776b7ab1eacafa776885b3f8550 (patch) | |
| tree | d56f0ba51263c2500ebdeb49c9bfd633bfe7f68f /lib/libssl/ssl_lib.c | |
| parent | Provide a ssl3_get_cipher_by_id() function that allows ciphers to be looked (diff) | |
| download | wireguard-openbsd-e4f3aecf84380776b7ab1eacafa776885b3f8550.tar.xz wireguard-openbsd-e4f3aecf84380776b7ab1eacafa776885b3f8550.zip | |
Currently, ssl3_put_char_by_bytes(NULL, NULL) is just a long handed way
of writing "2". Add a define for the SSL3_CIPHER_VALUE_SIZE (rather than
using a less-readable hardcoded constant everywhere) and replace the
ssl3_put_char_by_bytes(NULL, NULL) calls with it.
ok bcook@ miod@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index bf94321eeab..b3f42102665 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.79 2014/08/10 14:42:56 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.80 2014/08/11 01:10:42 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1407,13 +1407,12 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, { const SSL_CIPHER *c; STACK_OF(SSL_CIPHER) *sk; - int i, n; + int i; if (s->s3) s->s3->send_connection_binding = 0; - n = ssl3_put_cipher_by_char(NULL, NULL); - if ((num % n) != 0) { + if ((num % SSL3_CIPHER_VALUE_SIZE) != 0) { SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST, SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST); return (NULL); @@ -1425,11 +1424,10 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, sk_SSL_CIPHER_zero(sk); } - for (i = 0; i < num; i += n) { + for (i = 0; i < num; i += SSL3_CIPHER_VALUE_SIZE) { /* Check for SCSV */ - if (s->s3 && (n != 3 || !p[0]) && - (p[n - 2] == ((SSL3_CK_SCSV >> 8) & 0xff)) && - (p[n - 1] == (SSL3_CK_SCSV & 0xff))) { + if (s->s3 && (p[0] == ((SSL3_CK_SCSV >> 8) & 0xff)) && + (p[1] == (SSL3_CK_SCSV & 0xff))) { /* SCSV fatal if renegotiating */ if (s->renegotiate) { SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST, @@ -1440,12 +1438,12 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, goto err; } s->s3->send_connection_binding = 1; - p += n; + p += SSL3_CIPHER_VALUE_SIZE; continue; } c = ssl3_get_cipher_by_char(p); - p += n; + p += SSL3_CIPHER_VALUE_SIZE; if (c != NULL) { if (!sk_SSL_CIPHER_push(sk, c)) { SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST, |