the final byte of a pkcs7 padded plaintext can never be 0

[openssl.git] / ssl / s2_enc.c

diff --git a/ssl/s2_enc.c b/ssl/s2_enc.c
index d3b144f1c52cbd6a11b24684ce5f0b93ff5afd3f..18882bf70487f56bf73abff5b6b3a36ccaf849b4 100644 (file)
--- a/ssl/s2_enc.c
+++ b/ssl/s2_enc.c
@@ -59,7 +59,6 @@
 #include "ssl_locl.h"
 #ifndef OPENSSL_NO_SSL2
 #include <stdio.h>
-#include "cryptlib.h"
 
 int ssl2_enc_init(SSL *s, int client)
        {
@@ -101,7 +100,7 @@ int ssl2_enc_init(SSL *s, int client)
        if (ssl2_generate_key_material(s) <= 0)
                return 0;
 
-       OPENSSL_assert(c->iv_len <= sizeof s->session->key_arg);
+       OPENSSL_assert(c->iv_len <= (int)sizeof(s->session->key_arg));
        EVP_EncryptInit_ex(ws,c,NULL,&(s->s2->key_material[(client)?num:0]),
                s->session->key_arg);
        EVP_DecryptInit_ex(rs,c,NULL,&(s->s2->key_material[(client)?0:num]),