Updated Branches: refs/heads/master 6413af54e -> 6f810cd3c
TS-2450 make the T61String type not trigger the assertion failure if build with --enable-debug. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6f810cd3 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6f810cd3 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6f810cd3 Branch: refs/heads/master Commit: 6f810cd3c90ab6d031a13b259c8ab7efe558073f Parents: 6413af5 Author: weijin <[email protected]> Authored: Fri Dec 27 11:35:51 2013 +0800 Committer: weijin <[email protected]> Committed: Fri Dec 27 11:43:37 2013 +0800 ---------------------------------------------------------------------- CHANGES | 2 ++ iocore/net/SSLUtils.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f810cd3/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2d3cb33..c17904a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 4.2.0 + *) [TS-2450] Fix assertion failure for T61String type. + *) [TS-2117] make hipes plugin build *) [TS-2452] Can't access a deleted object. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6f810cd3/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index 686194b..5ddbc52 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -600,7 +600,8 @@ asn1_strdup(ASN1_STRING * s) // Make sure we have an 8-bit encoding. ink_assert(ASN1_STRING_type(s) == V_ASN1_IA5STRING || ASN1_STRING_type(s) == V_ASN1_UTF8STRING || - ASN1_STRING_type(s) == V_ASN1_PRINTABLESTRING); + ASN1_STRING_type(s) == V_ASN1_PRINTABLESTRING || + ASN1_STRING_type(s) == V_ASN1_T61STRING); return ats_strndup((const char *)ASN1_STRING_data(s), ASN1_STRING_length(s)); }
