Fix Bleichenbacher PKCS #1 1.5 countermeasure.

[oweals/openssl.git] / ssl / ssl3.h

diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index ccdbfa6d298760af78248c4286c43181c873df76..7ee1feaa677cb3785a2dfebbb83bd6948fe7c0b3 100644 (file)
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -59,6 +59,9 @@
 #ifndef HEADER_SSL3_H 
 #define HEADER_SSL3_H 
 
+#ifndef NO_COMP
+#include <openssl/comp.h>
+#endif
 #include <openssl/buffer.h>
 #include <openssl/evp.h>
 #include <openssl/ssl.h>
@@ -240,9 +243,9 @@ typedef struct ssl3_state_st
        /* storage for Alert/Handshake protocol data received but not
         * yet processed by ssl3_read_bytes: */
        unsigned char alert_fragment[2];
-       int alert_fragment_len;
+       unsigned int alert_fragment_len;
        unsigned char handshake_fragment[4];
-       int handshake_fragment_len;
+       unsigned int handshake_fragment_len;
 
        /* partial write - check the numbers match */
        unsigned int wnum;      /* number of bytes sent so far */
@@ -310,7 +313,7 @@ typedef struct ssl3_state_st
 
                const EVP_CIPHER *new_sym_enc;
                const EVP_MD *new_hash;
-#ifdef HEADER_COMP_H
+#ifndef NO_COMP
                const SSL_COMP *new_compression;
 #else
                char *new_compression;