Make disabling last cipher work.

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index ad9b762101951ead9d455e39a1c0671cead0d66f..405da44cf616071f3ef33b0469b90c9d80be3e67 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -954,7 +954,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
                int rule, int strength_bits,
                CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
        {
                int rule, int strength_bits,
                CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
        {

-       CIPHER_ORDER *head, *tail, *curr, *curr2, *last;
+       CIPHER_ORDER *head, *tail, *curr, *next, *last;

        const SSL_CIPHER *cp;
        int reverse = 0;
 
        const SSL_CIPHER *cp;
        int reverse = 0;
 


@@ -971,21 +971,25 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
 
        if (reverse)
                {
 
        if (reverse)
                {

-               curr = tail;
+               next = tail;

                last = head;
                }
        else
                {
                last = head;
                }
        else
                {

-               curr = head;
+               next = head;

                last = tail;
                }
 
                last = tail;
                }
 

-       curr2 = curr;
+       curr = NULL;

        for (;;)
                {
        for (;;)
                {

-               if ((curr == NULL) || (curr == last)) break;
-               curr = curr2;
-               curr2 = reverse ? curr->prev : curr->next;
+               if (curr == last) break;
+
+               curr = next;
+
+               if (curr == NULL) break;
+
+               next = reverse ? curr->prev : curr->next;

 
                cp = curr->cipher;
 
 
                cp = curr->cipher;