1 files changed, 3 insertions, 6 deletions

diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 0c2aa249b4..514292a03e 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -115,10 +115,7 @@
  */
 #include <stdio.h>
 #include <openssl/objects.h>
-#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
-#endif
-
 #include "ssl_locl.h"
 
 #define SSL_ENC_DES_IDX         0
@@ -137,7 +134,7 @@
 
 
 static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={
-        NULL,NULL,NULL,NULL,NULL,NULL,
+        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL
         };
 
 #define SSL_COMP_NULL_IDX       0
@@ -389,7 +386,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                 break;
                 }
 
-        if ((i < 0) || (i > SSL_ENC_NUM_IDX))
+        if ((i < 0) || (i >= SSL_ENC_NUM_IDX))
                 *enc=NULL;
         else
                 {
@@ -411,7 +408,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                 i= -1;
                 break;
                 }
-        if ((i < 0) || (i > SSL_MD_NUM_IDX))
+        if ((i < 0) || (i >= SSL_MD_NUM_IDX))
                 *md=NULL;
         else
                 *md=ssl_digest_methods[i];