Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 63952 invoked from network); 1 Feb 2011 22:11:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Feb 2011 22:11:25 -0000 Received: (qmail 5626 invoked by uid 500); 1 Feb 2011 22:11:25 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 5600 invoked by uid 500); 1 Feb 2011 22:11:25 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 5592 invoked by uid 99); 1 Feb 2011 22:11:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 22:11:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Feb 2011 22:11:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB86023889EA; Tue, 1 Feb 2011 22:11:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066243 - /activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp Date: Tue, 01 Feb 2011 22:11:04 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110201221104.BB86023889EA@eris.apache.org> Author: tabish Date: Tue Feb 1 22:11:04 2011 New Revision: 1066243 URL: http://svn.apache.org/viewvc?rev=1066243&view=rev Log: Apply patch for: https://issues.apache.org/jira/browse/AMQCPP-347 Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp Modified: activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp?rev=1066243&r1=1066242&r2=1066243&view=diff ============================================================================== --- activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp (original) +++ activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp Tue Feb 1 22:11:04 2011 @@ -656,7 +656,9 @@ void OpenSSLSocket::verifyServerCert( co const unsigned char* data = extension->value->data; STACK_OF(CONF_VALUE)* confValue = - method->i2v( method, method->d2i( NULL, &data, extension->value->length ), NULL ); + method->i2v( method, method->it ? + ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) : + method->d2i( NULL, &data, extension->value->length ), NULL ); CONF_VALUE* value = NULL;