diff options
| author | David Benjamin <davidben@chromium.org> | 2014-08-15 21:49:12 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-08-18 21:55:05 +0400 |
| commit | 6f2600199c82330240de9a7f65a801b6f606b7b3 (patch) | |
| tree | 4bac211624f6854a0294d89d9ce6ca640fe3742e /ssl/ssl_lib.c | |
| parent | fb4ea28bb84875a844cd65a9e4a2167ec884cd48 (diff) | |
Mark all SSL_CIPHERs as const.
This lets us put the SSL_CIPHER table in the data section. For type-checking,
make STACK_OF(SSL_CIPHER) cast everything to const SSL_CIPHER*.
Note that this will require some changes in consumers which weren't using a
const SSL_CIPHER *.
Change-Id: Iff734ac0e36f9e5c4a0f3c8411c7f727b820469c
Reviewed-on: https://boringssl-review.googlesource.com/1541
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ecc0c276..ea8af85f 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1398,7 +1398,7 @@ STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s) /** The old interface to get the same thing as SSL_get_ciphers() */ const char *SSL_get_cipher_list(const SSL *s,int n) { - SSL_CIPHER *c; + const SSL_CIPHER *c; STACK_OF(SSL_CIPHER) *sk; if (s == NULL) return(NULL); @@ -1472,7 +1472,7 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) { char *p; STACK_OF(SSL_CIPHER) *sk; - SSL_CIPHER *c; + const SSL_CIPHER *c; int i; if ((s->session == NULL) || (s->session->ciphers == NULL) || @@ -1510,7 +1510,7 @@ char *SSL_get_shared_ciphers(const SSL *s,char *buf,int len) int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p) { int i; - SSL_CIPHER *c; + const SSL_CIPHER *c; CERT *ct = s->cert; unsigned char *q; int no_scsv = s->renegotiate; @@ -1546,7 +1546,7 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p) { if (!no_scsv) { - static SSL_CIPHER scsv = + static const SSL_CIPHER scsv = { 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -1557,7 +1557,7 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p) } if (s->fallback_scsv) { - static SSL_CIPHER fallback_scsv = + static const SSL_CIPHER fallback_scsv = { 0, NULL, SSL3_CK_FALLBACK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; |