diff options
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 52f91cfe60..4116fd12f1 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -137,7 +137,7 @@ | |||
| 137 | 137 | ||
| 138 | 138 | ||
| 139 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ | 139 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ |
| 140 | NULL,NULL,NULL,NULL,NULL,NULL, | 140 | NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL |
| 141 | }; | 141 | }; |
| 142 | 142 | ||
| 143 | #define SSL_COMP_NULL_IDX 0 | 143 | #define SSL_COMP_NULL_IDX 0 |
| @@ -389,7 +389,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 389 | break; | 389 | break; |
| 390 | } | 390 | } |
| 391 | 391 | ||
| 392 | if ((i < 0) || (i > SSL_ENC_NUM_IDX)) | 392 | if ((i < 0) || (i >= SSL_ENC_NUM_IDX)) |
| 393 | *enc=NULL; | 393 | *enc=NULL; |
| 394 | else | 394 | else |
| 395 | { | 395 | { |
| @@ -411,7 +411,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 411 | i= -1; | 411 | i= -1; |
| 412 | break; | 412 | break; |
| 413 | } | 413 | } |
| 414 | if ((i < 0) || (i > SSL_MD_NUM_IDX)) | 414 | if ((i < 0) || (i >= SSL_MD_NUM_IDX)) |
| 415 | *md=NULL; | 415 | *md=NULL; |
| 416 | else | 416 | else |
| 417 | *md=ssl_digest_methods[i]; | 417 | *md=ssl_digest_methods[i]; |
| @@ -1355,7 +1355,7 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) | |||
| 1355 | comp->method=cm; | 1355 | comp->method=cm; |
| 1356 | load_builtin_compressions(); | 1356 | load_builtin_compressions(); |
| 1357 | if (ssl_comp_methods | 1357 | if (ssl_comp_methods |
| 1358 | && sk_SSL_COMP_find(ssl_comp_methods,comp) >= 0) | 1358 | && !sk_SSL_COMP_find(ssl_comp_methods,comp)) |
| 1359 | { | 1359 | { |
| 1360 | OPENSSL_free(comp); | 1360 | OPENSSL_free(comp); |
| 1361 | MemCheck_on(); | 1361 | MemCheck_on(); |
