diff options
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index bee3507ea1..a8ce186b78 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1027,7 +1027,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
1027 | const SSL_CIPHER **ca_list) | 1027 | const SSL_CIPHER **ca_list) |
1028 | { | 1028 | { |
1029 | unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, algo_strength; | 1029 | unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, algo_strength; |
1030 | const char *l, *start, *buf; | 1030 | const char *l, *buf; |
1031 | int j, multi, found, rule, retval, ok, buflen; | 1031 | int j, multi, found, rule, retval, ok, buflen; |
1032 | unsigned long cipher_id = 0; | 1032 | unsigned long cipher_id = 0; |
1033 | char ch; | 1033 | char ch; |
@@ -1064,7 +1064,6 @@ static int ssl_cipher_process_rulestr(const char *rule_str, | |||
1064 | alg_ssl = 0; | 1064 | alg_ssl = 0; |
1065 | algo_strength = 0; | 1065 | algo_strength = 0; |
1066 | 1066 | ||
1067 | start=l; | ||
1068 | for (;;) | 1067 | for (;;) |
1069 | { | 1068 | { |
1070 | ch = *l; | 1069 | ch = *l; |
@@ -1456,7 +1455,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) | |||
1456 | int is_export,pkl,kl; | 1455 | int is_export,pkl,kl; |
1457 | const char *ver,*exp_str; | 1456 | const char *ver,*exp_str; |
1458 | const char *kx,*au,*enc,*mac; | 1457 | const char *kx,*au,*enc,*mac; |
1459 | unsigned long alg_mkey,alg_auth,alg_enc,alg_mac,alg_ssl,alg2,alg_s; | 1458 | unsigned long alg_mkey,alg_auth,alg_enc,alg_mac,alg_ssl,alg2; |
1460 | #ifdef KSSL_DEBUG | 1459 | #ifdef KSSL_DEBUG |
1461 | static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s AL=%lx/%lx/%lx/%lx/%lx\n"; | 1460 | static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s AL=%lx/%lx/%lx/%lx/%lx\n"; |
1462 | #else | 1461 | #else |
@@ -1469,7 +1468,6 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) | |||
1469 | alg_mac = cipher->algorithm_mac; | 1468 | alg_mac = cipher->algorithm_mac; |
1470 | alg_ssl = cipher->algorithm_ssl; | 1469 | alg_ssl = cipher->algorithm_ssl; |
1471 | 1470 | ||
1472 | alg_s=cipher->algo_strength; | ||
1473 | alg2=cipher->algorithm2; | 1471 | alg2=cipher->algorithm2; |
1474 | 1472 | ||
1475 | is_export=SSL_C_IS_EXPORT(cipher); | 1473 | is_export=SSL_C_IS_EXPORT(cipher); |