diff options
Diffstat (limited to 'src/lib/libssl/ssl_asn1.c')
-rw-r--r-- | src/lib/libssl/ssl_asn1.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c index d8ff8fc4a3..4d5900ad2f 100644 --- a/src/lib/libssl/ssl_asn1.c +++ b/src/lib/libssl/ssl_asn1.c | |||
@@ -226,7 +226,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp) | |||
226 | M_ASN1_I2D_finish(); | 226 | M_ASN1_I2D_finish(); |
227 | } | 227 | } |
228 | 228 | ||
229 | SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, | 229 | SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char * const *pp, |
230 | long length) | 230 | long length) |
231 | { | 231 | { |
232 | int version,ssl_version=0,i; | 232 | int version,ssl_version=0,i; |
@@ -266,7 +266,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, | |||
266 | ((unsigned long)os.data[1]<< 8L)| | 266 | ((unsigned long)os.data[1]<< 8L)| |
267 | (unsigned long)os.data[2]; | 267 | (unsigned long)os.data[2]; |
268 | } | 268 | } |
269 | else if ((ssl_version>>8) == 3) | 269 | else if ((ssl_version>>8) == SSL3_VERSION_MAJOR) |
270 | { | 270 | { |
271 | if (os.length != 2) | 271 | if (os.length != 2) |
272 | { | 272 | { |
@@ -287,9 +287,9 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, | |||
287 | ret->cipher_id=id; | 287 | ret->cipher_id=id; |
288 | 288 | ||
289 | M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING); | 289 | M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING); |
290 | if ((ssl_version>>8) == SSL3_VERSION) | 290 | if ((ssl_version>>8) == SSL3_VERSION_MAJOR) |
291 | i=SSL3_MAX_SSL_SESSION_ID_LENGTH; | 291 | i=SSL3_MAX_SSL_SESSION_ID_LENGTH; |
292 | else /* if (ssl_version == SSL2_VERSION) */ | 292 | else /* if (ssl_version == SSL2_VERSION_MAJOR) */ |
293 | i=SSL2_MAX_SSL_SESSION_ID_LENGTH; | 293 | i=SSL2_MAX_SSL_SESSION_ID_LENGTH; |
294 | 294 | ||
295 | if (os.length > i) | 295 | if (os.length > i) |