Change safestack reimplementation to match 0.9.8. Fix additional gcc 4.2 value not used warnings.
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 7b3b7d8..e976ba8 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c
@@ -466,11 +466,11 @@ 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 fa21d6f..6490d0b 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c
@@ -657,7 +657,7 @@ { 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 bb07175..ccb30e0 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c
@@ -764,7 +764,7 @@ 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 e573025..5ba5b32 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c
@@ -1417,7 +1417,7 @@ 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); }