Commit 8f243ab6 authored by Thijs Alkemade's avatar Thijs Alkemade Committed by Dr. Stephen Henson
Browse files

Make disabling last cipher work. 

(cherry picked from commit 7cb472bd)
parent 9223a31e

ssl/ssl_ciph.c

+11 −7
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id, 
		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;
@@ -949,21 +949,25 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id, 


	if (reverse)

		{

		curr = tail;

		next = tail;

		last = head;

		}

	else

		{

		curr = head;

		next = head;

		last = tail;

		}



	curr2 = curr;

	curr = NULL;

	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;