Extend DTLS method macros.
[openssl.git] / ssl / ssl2.h
index f8b56af..eb25dcb 100644 (file)
@@ -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 */
@@ -155,6 +155,8 @@ extern "C" {
 #define  CERT          char
 #endif
 
+#ifndef OPENSSL_NO_SSL_INTERN
+
 typedef struct ssl2_state_st
        {
        int three_byte_header;
@@ -189,7 +191,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,17 +210,19 @@ 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;
                } tmp;
        } SSL2_STATE;
 
+#endif
+
 /* SSLv2 */
 /* client */
 #define SSL2_ST_SEND_CLIENT_HELLO_A            (0x10|SSL_ST_CONNECT)