diff options
| author | Ben Laurie <ben@links.org> | 2014-06-29 21:05:23 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-06-29 21:05:23 +0100 |
| commit | 8892ce77143fb01f27354dc63489e43eb7953b03 (patch) | |
| tree | c307996b0f304fe2ec36aeaae888936f27c9c84c /ssl | |
| parent | 340daf6a06aca2bf9a694eee091df42eddfae5cf (diff) | |
Constification - mostly originally from Chromium.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_lib.c | 4 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 4 | ||||
| -rw-r--r-- | ssl/ssl.h | 2 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 7d9d91ff2c..6405111066 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -72,7 +72,7 @@ static int dtls1_handshake_write(SSL *s); const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT; int dtls1_listen(SSL *s, struct sockaddr *client); -SSL3_ENC_METHOD DTLSv1_enc_data={ +const SSL3_ENC_METHOD DTLSv1_enc_data={ tls1_enc, tls1_mac, tls1_setup_key_block, @@ -91,7 +91,7 @@ SSL3_ENC_METHOD DTLSv1_enc_data={ dtls1_handshake_write }; -SSL3_ENC_METHOD DTLSv1_2_enc_data={ +const SSL3_ENC_METHOD DTLSv1_2_enc_data={ tls1_enc, tls1_mac, tls1_setup_key_block, diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 36ff200137..e1bfb7e3d2 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -162,7 +162,7 @@ const char ssl3_version_str[]="SSLv3" OPENSSL_VERSION_PTEXT; #define SSL3_NUM_CIPHERS (sizeof(ssl3_ciphers)/sizeof(SSL_CIPHER)) /* list of available SSLv3 ciphers (sorted by id) */ -OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ +OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[]={ /* The RSA ciphers */ /* Cipher 01 */ @@ -3099,7 +3099,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={ /* end of list */ }; -SSL3_ENC_METHOD SSLv3_enc_data={ +const SSL3_ENC_METHOD SSLv3_enc_data={ ssl3_enc, n_ssl3_mac, ssl3_setup_key_block, @@ -545,7 +545,7 @@ struct ssl_method_st const SSL_CIPHER *(*get_cipher)(unsigned ncipher); const struct ssl_method_st *(*get_ssl_method)(int version); long (*get_timeout)(void); - struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */ + const struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */ int (*ssl_version)(void); long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void)); long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void)); diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index d564bc742d..371085772f 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -772,7 +772,7 @@ typedef struct ssl3_buf_freelist_entry_st extern SSL3_ENC_METHOD ssl3_undef_enc_method; OPENSSL_EXTERN const SSL_CIPHER ssl2_ciphers[]; -OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; +OPENSSL_EXTERN const SSL_CIPHER ssl3_ciphers[]; SSL_METHOD *ssl_bad_method(int ver); @@ -780,9 +780,9 @@ SSL_METHOD *ssl_bad_method(int ver); extern SSL3_ENC_METHOD TLSv1_enc_data; extern SSL3_ENC_METHOD TLSv1_1_enc_data; extern SSL3_ENC_METHOD TLSv1_2_enc_data; -extern SSL3_ENC_METHOD SSLv3_enc_data; -extern SSL3_ENC_METHOD DTLSv1_enc_data; -extern SSL3_ENC_METHOD DTLSv1_2_enc_data; +extern const SSL3_ENC_METHOD SSLv3_enc_data; +extern const SSL3_ENC_METHOD DTLSv1_enc_data; +extern const SSL3_ENC_METHOD DTLSv1_2_enc_data; #define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \ s_get_meth, enc_data) \ |