From b68cad6cc75a3d08390cf1f30d40253d8dd0d1c9 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Thu, 23 Aug 2012 08:34:18 +0000 Subject: [PATCH] - Made cipersuites in ssl context const (no intention to modify) - Adjusted ssl_set_ciphersuites() to match --- include/polarssl/ssl.h | 6 +++--- library/ssl_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h index 40a57a7dc..2201bde81 100644 --- a/include/polarssl/ssl.h +++ b/include/polarssl/ssl.h @@ -369,7 +369,7 @@ struct _ssl_context unsigned char *, size_t); int do_crypt; /*!< en(de)cryption flag */ - int *ciphersuites; /*!< allowed ciphersuites */ + const int *ciphersuites; /*!< allowed ciphersuites */ size_t pmslen; /*!< premaster length */ unsigned int keylen; /*!< symmetric key length */ size_t minlen; /*!< min. ciphertext length */ @@ -405,7 +405,7 @@ struct _ssl_context extern "C" { #endif -extern int ssl_default_ciphersuites[]; +extern const int ssl_default_ciphersuites[]; #if defined(POLARSSL_SSL_HW_RECORD_ACCEL) extern int (*ssl_hw_record_init)(ssl_context *ssl, @@ -577,7 +577,7 @@ void ssl_set_session( ssl_context *ssl, int resume, int timeout, * \param ssl SSL context * \param ciphersuites 0-terminated list of allowed ciphersuites */ -void ssl_set_ciphersuites( ssl_context *ssl, int *ciphersuites ); +void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites ); /** * \brief Set the data required to verify peer certificate diff --git a/library/ssl_tls.c b/library/ssl_tls.c index a458e6287..2d86fda6f 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -2809,7 +2809,7 @@ void ssl_set_session( ssl_context *ssl, int resume, int timeout, ssl->session = session; } -void ssl_set_ciphersuites( ssl_context *ssl, int *ciphersuites ) +void ssl_set_ciphersuites( ssl_context *ssl, const int *ciphersuites ) { ssl->ciphersuites = ciphersuites; } @@ -3153,7 +3153,7 @@ const char *ssl_get_version( const ssl_context *ssl ) return( "unknown" ); } -int ssl_default_ciphersuites[] = +const int ssl_default_ciphersuites[] = { #if defined(POLARSSL_DHM_C) #if defined(POLARSSL_AES_C)