OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/libssl/ssl2.h b/src/lib/libssl/ssl2.h
index f8b56afb6b..99a52ea0dd 100644
--- a/src/lib/libssl/ssl2.h
+++ b/src/lib/libssl/ssl2.h
@@ -133,7 +133,7 @@ extern "C" {
 
 /* Upper/Lower Bounds */
 #define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS      256
-#ifdef MPE
+#ifdef OPENSSL_SYS_MPE
 #define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    29998u
 #else
 #define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    32767u  /* 2^15-1 */
@@ -189,7 +189,6 @@ typedef struct ssl2_state_st
         unsigned char *ract_data;
         unsigned char *wact_data;
         unsigned char *mac_data;
-        unsigned char *pad_data;
 
         unsigned char *read_key;
         unsigned char *write_key;
@@ -209,11 +208,11 @@ typedef struct ssl2_state_st
                 unsigned int conn_id_length;
                 unsigned int cert_type; 
                 unsigned int cert_length;
-                int csl; 
-                int clear;
+                unsigned int csl; 
+                unsigned int clear;
                 unsigned int enc; 
                 unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-                int cipher_spec_length;
+                unsigned int cipher_spec_length;
                 unsigned int session_id_length;
                 unsigned int clen;
                 unsigned int rlen;