diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-09-07 13:25:15 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-09-07 13:25:15 +0000 |
| commit | a6fbcb42209e2818c3d479da07aa71a7c1b2dd1a (patch) | |
| tree | 01e8f25a0e28a70b861cec21bafb92e1deb6d91a /ssl | |
| parent | 8164032a2e34ac236775cfcf6301d7c74534bbe4 (diff) | |
| download | openssl-a6fbcb42209e2818c3d479da07aa71a7c1b2dd1a.tar.gz | |
Change safestack reimplementation to match 0.9.8.
Fix additional gcc 4.2 value not used warnings.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s2_clnt.c | 4 | ||||
| -rw-r--r-- | ssl/s2_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_cert.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_ciph.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 7b3b7d8eac..e976ba82e9 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -466,11 +466,11 @@ static int get_server_hello(SSL *s) return(-1); } - sk_SSL_CIPHER_set_cmp_func(sk,ssl_cipher_ptr_id_cmp); + (void)sk_SSL_CIPHER_set_cmp_func(sk,ssl_cipher_ptr_id_cmp); /* get the array of ciphers we will accept */ cl=SSL_get_ciphers(s); - sk_SSL_CIPHER_set_cmp_func(cl,ssl_cipher_ptr_id_cmp); + (void)sk_SSL_CIPHER_set_cmp_func(cl,ssl_cipher_ptr_id_cmp); /* * If server preference flag set, choose the first diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c index fa21d6fe68..6490d0bf1b 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -657,7 +657,7 @@ static int get_client_hello(SSL *s) { if (sk_SSL_CIPHER_find(allow,sk_SSL_CIPHER_value(prio,z)) < 0) { - sk_SSL_CIPHER_delete(prio,z); + (void)sk_SSL_CIPHER_delete(prio,z); z--; } } diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index bb07175dcf..ccb30e0760 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -764,7 +764,7 @@ err: if(x != NULL) X509_free(x); - sk_X509_NAME_set_cmp_func(stack,oldcmp); + (void)sk_X509_NAME_set_cmp_func(stack,oldcmp); return ret; } diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index e5730251ae..5ba5b32a07 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1417,7 +1417,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method, if (*cipher_list_by_id != NULL) sk_SSL_CIPHER_free(*cipher_list_by_id); *cipher_list_by_id = tmp_cipher_list; - sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp); + (void)sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp); return(cipherstack); } |