diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_asn1.c | 5 | ||||
-rw-r--r-- | src/lib/libssl/ssl_asn1.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c index dd958d6570..a721612bbc 100644 --- a/src/lib/libssl/src/ssl/ssl_asn1.c +++ b/src/lib/libssl/src/ssl/ssl_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_asn1.c,v 1.28 2014/07/11 09:24:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl_asn1.c,v 1.29 2014/07/11 12:07:30 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -287,6 +287,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
287 | if ((ssl_version >> 8) >= SSL3_VERSION_MAJOR) { | 287 | if ((ssl_version >> 8) >= SSL3_VERSION_MAJOR) { |
288 | if (os.length != 2) { | 288 | if (os.length != 2) { |
289 | c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH; | 289 | c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH; |
290 | c.line = __LINE__; | ||
290 | goto err; | 291 | goto err; |
291 | } | 292 | } |
292 | id = 0x03000000L| | 293 | id = 0x03000000L| |
@@ -294,6 +295,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
294 | (unsigned long)os.data[1]; | 295 | (unsigned long)os.data[1]; |
295 | } else { | 296 | } else { |
296 | c.error = SSL_R_UNKNOWN_SSL_VERSION; | 297 | c.error = SSL_R_UNKNOWN_SSL_VERSION; |
298 | c.line = __LINE__; | ||
297 | goto err; | 299 | goto err; |
298 | } | 300 | } |
299 | 301 | ||
@@ -355,6 +357,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
355 | if (os.data != NULL) { | 357 | if (os.data != NULL) { |
356 | if (os.length > SSL_MAX_SID_CTX_LENGTH) { | 358 | if (os.length > SSL_MAX_SID_CTX_LENGTH) { |
357 | c.error = SSL_R_BAD_LENGTH; | 359 | c.error = SSL_R_BAD_LENGTH; |
360 | c.line = __LINE__; | ||
358 | goto err; | 361 | goto err; |
359 | } else { | 362 | } else { |
360 | ret->sid_ctx_length = os.length; | 363 | ret->sid_ctx_length = os.length; |
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c index dd958d6570..a721612bbc 100644 --- a/src/lib/libssl/ssl_asn1.c +++ b/src/lib/libssl/ssl_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_asn1.c,v 1.28 2014/07/11 09:24:44 beck Exp $ */ | 1 | /* $OpenBSD: ssl_asn1.c,v 1.29 2014/07/11 12:07:30 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -287,6 +287,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
287 | if ((ssl_version >> 8) >= SSL3_VERSION_MAJOR) { | 287 | if ((ssl_version >> 8) >= SSL3_VERSION_MAJOR) { |
288 | if (os.length != 2) { | 288 | if (os.length != 2) { |
289 | c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH; | 289 | c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH; |
290 | c.line = __LINE__; | ||
290 | goto err; | 291 | goto err; |
291 | } | 292 | } |
292 | id = 0x03000000L| | 293 | id = 0x03000000L| |
@@ -294,6 +295,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
294 | (unsigned long)os.data[1]; | 295 | (unsigned long)os.data[1]; |
295 | } else { | 296 | } else { |
296 | c.error = SSL_R_UNKNOWN_SSL_VERSION; | 297 | c.error = SSL_R_UNKNOWN_SSL_VERSION; |
298 | c.line = __LINE__; | ||
297 | goto err; | 299 | goto err; |
298 | } | 300 | } |
299 | 301 | ||
@@ -355,6 +357,7 @@ d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, long length) | |||
355 | if (os.data != NULL) { | 357 | if (os.data != NULL) { |
356 | if (os.length > SSL_MAX_SID_CTX_LENGTH) { | 358 | if (os.length > SSL_MAX_SID_CTX_LENGTH) { |
357 | c.error = SSL_R_BAD_LENGTH; | 359 | c.error = SSL_R_BAD_LENGTH; |
360 | c.line = __LINE__; | ||
358 | goto err; | 361 | goto err; |
359 | } else { | 362 | } else { |
360 | ret->sid_ctx_length = os.length; | 363 | ret->sid_ctx_length = os.length; |