diff options
| author | guenther <> | 2014-07-12 07:52:36 +0000 |
|---|---|---|
| committer | guenther <> | 2014-07-12 07:52:36 +0000 |
| commit | fcdf1845eeec6286344b1c18b494447d35796329 (patch) | |
| tree | 780fa3839e6985da6ec3456bc52fb82dce041573 | |
| parent | 9de134e1d05457951184d371409fa9ab7e2c3c31 (diff) | |
| download | openbsd-fcdf1845eeec6286344b1c18b494447d35796329.tar.gz openbsd-fcdf1845eeec6286344b1c18b494447d35796329.tar.bz2 openbsd-fcdf1845eeec6286344b1c18b494447d35796329.zip | |
Make disabling last cipher work.
From Thijs Alkemade via OpenSSL trunk
ok miod@
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl_ciph.c | 18 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index a79eafc9cf..9df4f8a0c9 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.63 2014/07/11 09:24:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.64 2014/07/12 07:52:36 guenther Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -1062,7 +1062,7 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey, | |||
| 1062 | unsigned long alg_ssl, unsigned long algo_strength, | 1062 | unsigned long alg_ssl, unsigned long algo_strength, |
| 1063 | int rule, int strength_bits, CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p) | 1063 | int rule, int strength_bits, CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p) |
| 1064 | { | 1064 | { |
| 1065 | CIPHER_ORDER *head, *tail, *curr, *curr2, *last; | 1065 | CIPHER_ORDER *head, *tail, *curr, *next, *last; |
| 1066 | const SSL_CIPHER *cp; | 1066 | const SSL_CIPHER *cp; |
| 1067 | int reverse = 0; | 1067 | int reverse = 0; |
| 1068 | 1068 | ||
| @@ -1074,19 +1074,19 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey, | |||
| 1074 | tail = *tail_p; | 1074 | tail = *tail_p; |
| 1075 | 1075 | ||
| 1076 | if (reverse) { | 1076 | if (reverse) { |
| 1077 | curr = tail; | 1077 | next = tail; |
| 1078 | last = head; | 1078 | last = head; |
| 1079 | } else { | 1079 | } else { |
| 1080 | curr = head; | 1080 | next = head; |
| 1081 | last = tail; | 1081 | last = tail; |
| 1082 | } | 1082 | } |
| 1083 | 1083 | ||
| 1084 | curr2 = curr; | 1084 | curr = NULL; |
| 1085 | for (;;) { | 1085 | for (;;) { |
| 1086 | if ((curr == NULL) | 1086 | if (curr == last) |
| 1087 | || (curr == last)) break; | 1087 | break; |
| 1088 | curr = curr2; | 1088 | curr = next; |
| 1089 | curr2 = reverse ? curr->prev : curr->next; | 1089 | next = reverse ? curr->prev : curr->next; |
| 1090 | 1090 | ||
| 1091 | cp = curr->cipher; | 1091 | cp = curr->cipher; |
| 1092 | 1092 | ||
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index a79eafc9cf..9df4f8a0c9 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_ciph.c,v 1.63 2014/07/11 09:24:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.64 2014/07/12 07:52:36 guenther Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -1062,7 +1062,7 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey, | |||
| 1062 | unsigned long alg_ssl, unsigned long algo_strength, | 1062 | unsigned long alg_ssl, unsigned long algo_strength, |
| 1063 | int rule, int strength_bits, CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p) | 1063 | int rule, int strength_bits, CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p) |
| 1064 | { | 1064 | { |
| 1065 | CIPHER_ORDER *head, *tail, *curr, *curr2, *last; | 1065 | CIPHER_ORDER *head, *tail, *curr, *next, *last; |
| 1066 | const SSL_CIPHER *cp; | 1066 | const SSL_CIPHER *cp; |
| 1067 | int reverse = 0; | 1067 | int reverse = 0; |
| 1068 | 1068 | ||
| @@ -1074,19 +1074,19 @@ ssl_cipher_apply_rule(unsigned long cipher_id, unsigned long alg_mkey, | |||
| 1074 | tail = *tail_p; | 1074 | tail = *tail_p; |
| 1075 | 1075 | ||
| 1076 | if (reverse) { | 1076 | if (reverse) { |
| 1077 | curr = tail; | 1077 | next = tail; |
| 1078 | last = head; | 1078 | last = head; |
| 1079 | } else { | 1079 | } else { |
| 1080 | curr = head; | 1080 | next = head; |
| 1081 | last = tail; | 1081 | last = tail; |
| 1082 | } | 1082 | } |
| 1083 | 1083 | ||
| 1084 | curr2 = curr; | 1084 | curr = NULL; |
| 1085 | for (;;) { | 1085 | for (;;) { |
| 1086 | if ((curr == NULL) | 1086 | if (curr == last) |
| 1087 | || (curr == last)) break; | 1087 | break; |
| 1088 | curr = curr2; | 1088 | curr = next; |
| 1089 | curr2 = reverse ? curr->prev : curr->next; | 1089 | next = reverse ? curr->prev : curr->next; |
| 1090 | 1090 | ||
| 1091 | cp = curr->cipher; | 1091 | cp = curr->cipher; |
| 1092 | 1092 | ||