aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_ciph.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-01-22 23:34:44 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-01-22 23:34:44 +0000
commit64287002ce4de3c8954a8bc9ccf6e82df695b69f (patch)
tree1e63648047d6e80958a827cbac80cbb410d0b1e8 /ssl/ssl_ciph.c
parentc88a900fa1348a47d69a13da7bb1205178a3472d (diff)
downloadopenssl-64287002ce4de3c8954a8bc9ccf6e82df695b69f.tar.gz
Minor patch: check only match @STRENGTH and remove eNULL
comment. Add documentation for the ciphers command including a full description of cipher lists.
Diffstat (limited to 'ssl/ssl_ciph.c')
-rw-r--r--ssl/ssl_ciph.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index c86f41e0cc..12b02a8d7c 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -536,19 +536,11 @@ static int ssl_cipher_strength_sort(CIPHER_ORDER *list, CIPHER_ORDER **head_p,
number_uses[curr->cipher->strength_bits]++;
curr = curr->next;
}
-#if 0
/*
* Go through the list of used strength_bits values in descending
- * order, omit strength_bits "0".
+ * order.
*/
- for (i = max_strength_bits; i > 0; i--)
- /* Do we really want this? If so "ALL:eNULL:@STRENGTH" puts eNULL
- * ciphers first???
- */
-
-#else
for (i = max_strength_bits; i >= 0; i--)
-#endif
if (number_uses[i] > 0)
ssl_cipher_apply_rule(0, 0, 0, 0, CIPHER_ORD, i,
list, head_p, tail_p);
@@ -679,7 +671,8 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
if (rule == CIPHER_SPECIAL)
{ /* special command */
ok = 0;
- if (!strncmp(buf, "STRENGTH", buflen))
+ if ((buflen == 8) &&
+ !strncmp(buf, "STRENGTH", 8))
ok = ssl_cipher_strength_sort(list,
head_p, tail_p);
else
@@ -689,7 +682,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
retval = 0;
/*
* We do not support any "multi" options
- * together with "@", so through away the
+ * together with "@", so throw away the
* rest of the command, if any left, until
* end or ':' is found.
*/