You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by ta...@apache.org on 2011/02/01 23:11:04 UTC

svn commit: r1066243 - /activemq/activemq-cpp/branches/activemq-cpp-3.2.x/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp

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;