diff options
Diffstat (limited to 'src/lib/libssl/ssl2.h')
-rw-r--r-- | src/lib/libssl/ssl2.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/lib/libssl/ssl2.h b/src/lib/libssl/ssl2.h index 29033c8be7..4052b11868 100644 --- a/src/lib/libssl/ssl2.h +++ b/src/lib/libssl/ssl2.h | |||
@@ -100,7 +100,7 @@ extern "C" { | |||
100 | #define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5 0x020700c0 | 100 | #define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5 0x020700c0 |
101 | #define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA 0x020701c0 /* v3 */ | 101 | #define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA 0x020701c0 /* v3 */ |
102 | #define SSL2_CK_RC4_64_WITH_MD5 0x02080080 /* MS hack */ | 102 | #define SSL2_CK_RC4_64_WITH_MD5 0x02080080 /* MS hack */ |
103 | 103 | ||
104 | #define SSL2_CK_DES_64_CFB64_WITH_MD5_1 0x02ff0800 /* SSLeay */ | 104 | #define SSL2_CK_DES_64_CFB64_WITH_MD5_1 0x02ff0800 /* SSLeay */ |
105 | #define SSL2_CK_NULL 0x02ff0810 /* SSLeay */ | 105 | #define SSL2_CK_NULL 0x02ff0810 /* SSLeay */ |
106 | 106 | ||
@@ -133,8 +133,8 @@ extern "C" { | |||
133 | 133 | ||
134 | /* Upper/Lower Bounds */ | 134 | /* Upper/Lower Bounds */ |
135 | #define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS 256 | 135 | #define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS 256 |
136 | #define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER 32767u /* 2^15-1 */ | 136 | #define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER 32767u /* 2^15-1 */ |
137 | #define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER 16383 /* 2^14-1 */ | 137 | #define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER 16383 /* 2^14-1 */ |
138 | 138 | ||
139 | #define SSL2_CHALLENGE_LENGTH 16 | 139 | #define SSL2_CHALLENGE_LENGTH 16 |
140 | /*#define SSL2_CHALLENGE_LENGTH 32 */ | 140 | /*#define SSL2_CHALLENGE_LENGTH 32 */ |
@@ -153,8 +153,7 @@ extern "C" { | |||
153 | 153 | ||
154 | #ifndef OPENSSL_NO_SSL_INTERN | 154 | #ifndef OPENSSL_NO_SSL_INTERN |
155 | 155 | ||
156 | typedef struct ssl2_state_st | 156 | typedef struct ssl2_state_st { |
157 | { | ||
158 | int three_byte_header; | 157 | int three_byte_header; |
159 | int clear_text; /* clear text */ | 158 | int clear_text; /* clear text */ |
160 | int escape; /* not used in SSLv2 */ | 159 | int escape; /* not used in SSLv2 */ |
@@ -167,8 +166,8 @@ typedef struct ssl2_state_st | |||
167 | const unsigned char *wpend_buf; | 166 | const unsigned char *wpend_buf; |
168 | 167 | ||
169 | int wpend_off; /* offset to data to write */ | 168 | int wpend_off; /* offset to data to write */ |
170 | int wpend_len; /* number of bytes passwd to write */ | 169 | int wpend_len; /* number of bytes passwd to write */ |
171 | int wpend_ret; /* number of bytes to return to caller */ | 170 | int wpend_ret; /* number of bytes to return to caller */ |
172 | 171 | ||
173 | /* buffer raw data */ | 172 | /* buffer raw data */ |
174 | int rbuf_left; | 173 | int rbuf_left; |
@@ -191,7 +190,7 @@ typedef struct ssl2_state_st | |||
191 | unsigned char *read_key; | 190 | unsigned char *read_key; |
192 | unsigned char *write_key; | 191 | unsigned char *write_key; |
193 | 192 | ||
194 | /* Stuff specifically to do with this SSL session */ | 193 | /* Stuff specifically to do with this SSL session */ |
195 | unsigned int challenge_length; | 194 | unsigned int challenge_length; |
196 | unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH]; | 195 | unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH]; |
197 | unsigned int conn_id_length; | 196 | unsigned int conn_id_length; |
@@ -202,20 +201,23 @@ typedef struct ssl2_state_st | |||
202 | unsigned long read_sequence; | 201 | unsigned long read_sequence; |
203 | unsigned long write_sequence; | 202 | unsigned long write_sequence; |
204 | 203 | ||
205 | struct { | 204 | struct { |
206 | unsigned int conn_id_length; | 205 | unsigned int conn_id_length; |
207 | unsigned int cert_type; | 206 | unsigned int cert_type; |
207 | |||
208 | unsigned int cert_length; | 208 | unsigned int cert_length; |
209 | unsigned int csl; | 209 | unsigned int csl; |
210 | |||
210 | unsigned int clear; | 211 | unsigned int clear; |
211 | unsigned int enc; | 212 | unsigned int enc; |
213 | |||
212 | unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH]; | 214 | unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH]; |
213 | unsigned int cipher_spec_length; | 215 | unsigned int cipher_spec_length; |
214 | unsigned int session_id_length; | 216 | unsigned int session_id_length; |
215 | unsigned int clen; | 217 | unsigned int clen; |
216 | unsigned int rlen; | 218 | unsigned int rlen; |
217 | } tmp; | 219 | } tmp; |
218 | } SSL2_STATE; | 220 | } SSL2_STATE; |
219 | 221 | ||
220 | #endif | 222 | #endif |
221 | 223 | ||
@@ -265,4 +267,3 @@ typedef struct ssl2_state_st | |||
265 | } | 267 | } |
266 | #endif | 268 | #endif |
267 | #endif | 269 | #endif |
268 | |||