aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/ssl_asn1.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2014-06-06 20:59:29 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2014-06-06 20:59:29 +0000
commit2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e (patch)
treea707d3fdb02faa3d4423773ae7b606febaa5e786 /ssl/ssl_asn1.c
parent06369e3974fbc83d3778807c090fbe69f20a27d4 (diff)
downloadsrc-2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e.tar.gz
src-2e22f5e2e00c1f1f599b03634ca27bb5b9ac471e.zip
Import OpenSSL 1.0.1h.vendor/openssl/1.0.1h
Approved by: so (delphij)
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=267188 svn path=/vendor-crypto/openssl/1.0.1h/; revision=267189; tag=vendor/openssl/1.0.1h
Diffstat (limited to 'ssl/ssl_asn1.c')
-rw-r--r--ssl/ssl_asn1.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 38540be1e538..477500371027 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -408,6 +408,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
if (os.length != 3)
{
c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH;
+ c.line=__LINE__;
goto err;
}
id=0x02000000L|
@@ -420,6 +421,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
if (os.length != 2)
{
c.error=SSL_R_CIPHER_CODE_WRONG_LENGTH;
+ c.line=__LINE__;
goto err;
}
id=0x03000000L|
@@ -429,6 +431,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
else
{
c.error=SSL_R_UNKNOWN_SSL_VERSION;
+ c.line=__LINE__;
goto err;
}
@@ -521,6 +524,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
if (os.length > SSL_MAX_SID_CTX_LENGTH)
{
c.error=SSL_R_BAD_LENGTH;
+ c.line=__LINE__;
goto err;
}
else