You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/12/18 16:59:04 UTC

svn commit: r1423497 [1/2] - in /qpid/proton/branches/kgiusti-proton-136: ./ proton-c/ proton-c/bindings/python/ proton-c/include/proton/ proton-c/src/ proton-c/src/engine/ proton-c/src/message/ proton-c/src/ssl/ proton-j/contrib/proton-hawtdispatch/sr...

Author: kgiusti
Date: Tue Dec 18 15:58:59 2012
New Revision: 1423497

URL: http://svn.apache.org/viewvc?rev=1423497&view=rev
Log:
PROTON-136: resync to latest trunk

Added:
    qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/DroppingWritableBuffer.java
      - copied unchanged from r1423447, qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/codec/DroppingWritableBuffer.java
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/server-wc-certificate.pem
      - copied unchanged from r1423447, qpid/proton/trunk/tests/proton_tests/ssl_db/server-wc-certificate.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/server-wc-private-key.pem
      - copied unchanged from r1423447, qpid/proton/trunk/tests/proton_tests/ssl_db/server-wc-private-key.pem
Removed:
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/DroppingWritableBuffer.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/DroppingWritableBuffer.java
Modified:
    qpid/proton/branches/kgiusti-proton-136/   (props changed)
    qpid/proton/branches/kgiusti-proton-136/proton-c/CMakeLists.txt
    qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/proton.py
    qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/python.i
    qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/driver.h
    qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/engine.h
    qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/ssl.h
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/driver.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine-internal.h
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/message/message.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/messenger.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/openssl.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/ssl_stub.c
    qpid/proton/branches/kgiusti-proton-136/proton-c/src/util.c
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java
    qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/scripts/proton.py
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/engine.py
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl.py
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/README.txt
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-certificate.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-private-key.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/ca-certificate.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/client-certificate.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/client-private-key.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/server-certificate.pem
    qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/server-private-key.pem

Propchange: qpid/proton/branches/kgiusti-proton-136/
------------------------------------------------------------------------------
  Merged /qpid/proton/trunk:r1421339-1423447

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/CMakeLists.txt?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/CMakeLists.txt (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/CMakeLists.txt Tue Dec 18 15:58:59 2012
@@ -55,9 +55,14 @@ set (MAN_INSTALL_DIR share/man CACHE PAT
 
 set (PROTON_SHARE ${SHARE_INSTALL_DIR}/proton-${PN_VERSION})
 
-if (${CMAKE_VERSION} VERSION_LESS "2.8.0")
+# Can't use ${CMAKE_VERSION) as it is not available in all versions of cmake 2.6
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.0")
+    # OPTIONAL does not exist in install before 2.8 so always make docs and install
     set (OPTIONAL_ARG "")
     add_custom_target(docs ALL)
+    # There are bugs in the OpenSSL detection that mean -lcrypto is missed from the link line
+    # so turn off unknown symbol warnings
+    set (NOENABLE_UNDEFINED_ERROR ON)
 else()
     set (OPTIONAL_ARG OPTIONAL)
     add_custom_target(docs)

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/proton.py?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/proton.py Tue Dec 18 15:58:59 2012
@@ -1713,6 +1713,29 @@ class Endpoint(object):
   def __init__(self):
     self.condition = None
 
+  def _update_cond(self):
+    impl = self._get_cond_impl()
+    pn_condition_clear(impl)
+    if self.condition:
+      pn_condition_set_name(impl, self.condition.name)
+      pn_condition_set_description(impl, self.condition.description)
+      info = Data(pn_condition_info(impl))
+      if self.condition.info:
+        info.put_object(self.condition.info)
+
+  @property
+  def remote_condition(self):
+    impl = self._get_remote_cond_impl()
+    if pn_condition_is_set(impl):
+      info_impl = Data(pn_condition_info(impl))
+      info_impl.rewind()
+      info_impl.next()
+      info = info_impl.get_object()
+      info_impl.rewind()
+      return Condition(pn_condition_get_name(impl),
+                       pn_condition_get_description(impl),
+                       info)
+
 class Condition:
 
   def __init__(self, name, description=None, info=None):
@@ -1760,18 +1783,11 @@ class Connection(Endpoint):
     else:
       return err
 
-  @property
-  def remote_condition(self):
-    impl = pn_connection_remote_condition(self._conn)
-    if pn_condition_is_set(impl):
-      info_impl = Data(pn_condition_info(impl))
-      info_impl.rewind()
-      info_impl.next()
-      info = info_impl.get_object()
-      info_impl.rewind()
-      return Condition(pn_condition_get_name(impl),
-                       pn_condition_get_description(impl),
-                       info)
+  def _get_cond_impl(self):
+    return pn_connection_condition(self._conn)
+
+  def _get_remote_cond_impl(self):
+    return pn_connection_remote_condition(self._conn)
 
   def _get_container(self):
     return pn_connection_get_container(self._conn)
@@ -1815,14 +1831,7 @@ class Connection(Endpoint):
     pn_connection_open(self._conn)
 
   def close(self):
-    if self.condition:
-      impl = pn_connection_condition(self._conn)
-      pn_condition_clear(impl)
-      pn_condition_set_name(impl, self.condition.name)
-      pn_condition_set_description(impl, self.condition.description)
-      info = Data(pn_condition_info(impl))
-      if self.condition.info:
-        info.put_object(self.condition.info)
+    self._update_cond()
     pn_connection_close(self._conn)
 
   @property
@@ -1870,10 +1879,17 @@ class Session(Endpoint):
       pn_session_free(self._ssn)
       del self._ssn
 
+  def _get_cond_impl(self):
+    return pn_session_condition(self._ssn)
+
+  def _get_remote_cond_impl(self):
+    return pn_session_remote_condition(self._ssn)
+
   def open(self):
     pn_session_open(self._ssn)
 
   def close(self):
+    self._update_cond()
     pn_session_close(self._ssn)
 
   @property
@@ -1924,10 +1940,17 @@ class Link(Endpoint):
     else:
       return err
 
+  def _get_cond_impl(self):
+    return pn_link_condition(self._link)
+
+  def _get_remote_cond_impl(self):
+    return pn_link_remote_condition(self._link)
+
   def open(self):
     pn_link_open(self._link)
 
   def close(self):
+    self._update_cond()
     pn_link_close(self._link)
 
   @property
@@ -2295,6 +2318,7 @@ class SSLDomain(object):
   MODE_CLIENT = PN_SSL_MODE_CLIENT
   MODE_SERVER = PN_SSL_MODE_SERVER
   VERIFY_PEER = PN_SSL_VERIFY_PEER
+  VERIFY_PEER_NAME = PN_SSL_VERIFY_PEER_NAME
   ANONYMOUS_PEER = PN_SSL_ANONYMOUS_PEER
 
   def __init__(self, mode):
@@ -2361,6 +2385,18 @@ class SSL(object):
   def resume_status(self):
     return pn_ssl_resume_status( self._ssl )
 
+  def _set_peer_hostname(self, hostname):
+    self._check(pn_ssl_set_peer_hostname( self._ssl, hostname ))
+  def _get_peer_hostname(self):
+    err, name = pn_ssl_get_peer_hostname( self._ssl, 1024 )
+    self._check(err)
+    return name
+  peer_hostname = property(_get_peer_hostname, _set_peer_hostname,
+                           doc="""
+Manage the expected name of the remote peer.  Used to authenticate the remote.
+""")
+
+
 class SSLSessionDetails(object):
   """ Unique identifier for the SSL session.  Used to resume previous session on a new
   SSL connection.

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/python.i
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/python.i?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/python.i (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/bindings/python/python.i Tue Dec 18 15:58:59 2012
@@ -418,5 +418,8 @@ bool pn_ssl_get_cipher_name(pn_ssl_t *ss
 bool pn_ssl_get_protocol_name(pn_ssl_t *ssl, char *OUTPUT, size_t MAX_OUTPUT_SIZE);
 %ignore pn_ssl_get_protocol_name;
 
+int pn_ssl_get_peer_hostname(pn_ssl_t *ssl, char *OUTPUT, size_t *OUTPUT_SIZE);
+%ignore pn_ssl_get_peer_hostname;
+
 
 %include "proton/cproton.i"

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/driver.h
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/driver.h?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/driver.h (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/driver.h Tue Dec 18 15:58:59 2012
@@ -358,6 +358,22 @@ void pn_connector_free(pn_connector_t *c
  */
 void pn_connector_activate(pn_connector_t *connector, pn_activate_criteria_t criteria);
 
+/** Return the activation status of the connector for a criteria
+ *
+ * Return the activation status (i.e. readable, writable) for the connector.  This function
+ * has the side-effect of canceling the activation of the criteria.
+ *
+ * Please note that this function must not be used for normal AMQP connectors.  It is only
+ * used for connectors created so the driver can track non-AMQP file descriptors.  Such
+ * connectors are never passed into pn_connector_process.
+ *
+ * @param[in] connector The connector object to activate
+ * @param[in] criteria  The criteria to test.  "Is this the reason the connector appeared
+ *                      in the work list?"
+ * @return true iff the criteria is activated on the connector.
+ */
+bool pn_connector_activated(pn_connector_t *connector, pn_activate_criteria_t criteria);
+
 
 #ifdef __cplusplus
 }

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/engine.h
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/engine.h?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/engine.h (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/engine.h Tue Dec 18 15:58:59 2012
@@ -402,6 +402,12 @@ void pn_delivery_set_context(pn_delivery
 pn_condition_t *pn_connection_condition(pn_connection_t *connection);
 pn_condition_t *pn_connection_remote_condition(pn_connection_t *connection);
 
+pn_condition_t *pn_session_condition(pn_session_t *session);
+pn_condition_t *pn_session_remote_condition(pn_session_t *session);
+
+pn_condition_t *pn_link_condition(pn_link_t *link);
+pn_condition_t *pn_link_remote_condition(pn_link_t *link);
+
 bool pn_condition_is_set(pn_condition_t *condition);
 void pn_condition_clear(pn_condition_t *condition);
 
@@ -414,6 +420,8 @@ int pn_condition_set_description(pn_cond
 pn_data_t *pn_condition_info(pn_condition_t *condition);
 
 bool pn_condition_is_redirect(pn_condition_t *condition);
+const char *pn_condition_redirect_host(pn_condition_t *condition);
+int pn_condition_redirect_port(pn_condition_t *condition);
 
 #ifdef __cplusplus
 }

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/ssl.h
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/ssl.h?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/ssl.h (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/include/proton/ssl.h Tue Dec 18 15:58:59 2012
@@ -152,17 +152,22 @@ int pn_ssl_domain_set_trusted_ca_db(pn_s
 
 /** Determines the level of peer validation.
  *
- *  VERIFY_PEER will only connect to those peers that provide a valid identifying
- *  certificate signed by a trusted CA and are using an authenticated cipher.
  *  ANONYMOUS_PEER does not require a valid certificate, and permits use of ciphers that
  *  do not provide authentication.
  *
+ *  VERIFY_PEER will only connect to those peers that provide a valid identifying
+ *  certificate signed by a trusted CA and are using an authenticated cipher.
+ *
+ *  VERIFY_PEER_NAME is like VERIFY_PEER, but also requires the peer's identity as
+ *  contained in the certificate to be valid (see ::pn_ssl_set_peer_hostname).
+ *
  *  ANONYMOUS_PEER is configured by default.
  */
 typedef enum {
   PN_SSL_VERIFY_NULL=0,   /**< internal use only */
   PN_SSL_VERIFY_PEER,     /**< require peer to provide a valid identifying certificate */
   PN_SSL_ANONYMOUS_PEER,  /**< do not require a certificate nor cipher authorization */
+  PN_SSL_VERIFY_PEER_NAME,/**< require valid certificate and matching name */
 } pn_ssl_verify_mode_t;
 
 /** Configure the level of verification used on the peer certificate.
@@ -269,6 +274,39 @@ bool pn_ssl_get_protocol_name(pn_ssl_t *
  */
 pn_ssl_resume_status_t pn_ssl_resume_status( pn_ssl_t *ssl );
 
+/** Set the expected identity of the remote peer.
+ *
+ * The hostname is used for two purposes: 1) when set on an SSL client, it is sent to the
+ * server during the handshake (if Server Name Indication is supported), and 2) it is used
+ * to check against the identifying name provided in the peer's certificate. If the
+ * supplied name does not exactly match a SubjectAltName (type DNS name), or the
+ * CommonName entry in the peer's certificate, the peer is considered unauthenticated
+ * (potential imposter), and the SSL connection is aborted.
+ *
+ * @note Verification of the hostname is only done if PN_SSL_VERIFY_PEER_NAME is enabled.
+ * See ::pn_ssl_set_peer_authentication.
+ *
+ * @param[in] ssl the ssl session.
+ * @param[in] hostname the expected identity of the remote. Must conform to the syntax as
+ * given in RFC1034, Section 3.5.
+ * @return 0 on success.
+ */
+int pn_ssl_set_peer_hostname( pn_ssl_t *ssl, const char *hostname);
+
+
+/** Access the configured peer identity.
+ *
+ * Return the expected identity of the remote peer, as set by ::pn_ssl_set_peer_hostname.
+ *
+ * @param[in] ssl the ssl session.
+ * @param[out] hostname buffer to hold the null-terminated name string. If null, no string
+ * is written.
+ * @param[in,out] bufsize on input set to the number of octets in hostname. On output, set
+ * to the number of octets needed to hold the value of hostname plus a null byte.  Zero if
+ * no hostname set.
+ * @return 0 on success.
+ */
+int pn_ssl_get_peer_hostname( pn_ssl_t *ssl, char *hostname, size_t *bufsize );
 
 #ifdef __cplusplus
 }

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/driver.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/driver.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/driver.c Tue Dec 18 15:58:59 2012
@@ -580,6 +580,28 @@ void pn_connector_activate(pn_connector_
 }
 
 
+bool pn_connector_activated(pn_connector_t *ctor, pn_activate_criteria_t crit)
+{
+    bool result = false;
+
+    switch (crit) {
+    case PN_CONNECTOR_WRITABLE :
+        result = ctor->pending_write;
+        ctor->pending_write = false;
+        ctor->status &= ~PN_SEL_WR;
+        break;
+
+    case PN_CONNECTOR_READABLE :
+        result = ctor->pending_read;
+        ctor->pending_read = false;
+        ctor->status &= ~PN_SEL_RD;
+        break;
+    }
+
+    return result;
+}
+
+
 static void pn_connector_write(pn_connector_t *ctor)
 {
   if (ctor->output_size > 0) {

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine-internal.h
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine-internal.h?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine-internal.h (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine-internal.h Tue Dec 18 15:58:59 2012
@@ -28,7 +28,7 @@
 #include "../dispatcher/dispatcher.h"
 #include "../util.h"
 
-typedef enum pn_endpoint_type_t {CONNECTION, SESSION, SENDER, RECEIVER, TRANSPORT} pn_endpoint_type_t;
+typedef enum pn_endpoint_type_t {CONNECTION, SESSION, SENDER, RECEIVER} pn_endpoint_type_t;
 
 typedef struct pn_endpoint_t pn_endpoint_t;
 
@@ -46,6 +46,7 @@ struct pn_endpoint_t {
   pn_state_t state;
   pn_error_t *error;
   pn_condition_t condition;
+  pn_condition_t remote_condition;
   pn_endpoint_t *endpoint_next;
   pn_endpoint_t *endpoint_prev;
   pn_endpoint_t *transport_next;

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/engine/engine.c Tue Dec 18 15:58:59 2012
@@ -136,8 +136,6 @@ pn_connection_t *pn_ep_get_connection(pn
   case SENDER:
   case RECEIVER:
     return ((pn_link_t *) endpoint)->session->connection;
-  case TRANSPORT:
-    return ((pn_transport_t *) endpoint)->connection;
   }
 
   return NULL;
@@ -159,28 +157,6 @@ void pn_close(pn_endpoint_t *endpoint)
   pn_modified(pn_ep_get_connection(endpoint), endpoint);
 }
 
-void pn_free(pn_endpoint_t *endpoint)
-{
-  switch (endpoint->type)
-  {
-  case CONNECTION:
-    pn_connection_free((pn_connection_t *)endpoint);
-    break;
-  case TRANSPORT:
-    pn_transport_free((pn_transport_t *)endpoint);
-    break;
-  case SESSION:
-    pn_session_free((pn_session_t *)endpoint);
-    break;
-  case SENDER:
-    pn_link_free((pn_link_t *)endpoint);
-    break;
-  case RECEIVER:
-    pn_link_free((pn_link_t *)endpoint);
-    break;
-  }
-}
-
 void pn_connection_reset(pn_connection_t *connection)
 {
   assert(connection);
@@ -425,6 +401,7 @@ void pn_endpoint_init(pn_endpoint_t *end
   endpoint->state = PN_LOCAL_UNINIT | PN_REMOTE_UNINIT;
   endpoint->error = pn_error();
   pn_condition_init(&endpoint->condition);
+  pn_condition_init(&endpoint->remote_condition);
   endpoint->endpoint_next = NULL;
   endpoint->endpoint_prev = NULL;
   endpoint->transport_next = NULL;
@@ -437,6 +414,7 @@ void pn_endpoint_init(pn_endpoint_t *end
 void pn_endpoint_tini(pn_endpoint_t *endpoint)
 {
   pn_error_free(endpoint->error);
+  pn_condition_tini(&endpoint->remote_condition);
   pn_condition_tini(&endpoint->condition);
 }
 
@@ -899,6 +877,7 @@ int pn_transport_unbind(pn_transport_t *
 
   pn_endpoint_t *endpoint = conn->endpoint_head;
   while (endpoint) {
+    pn_condition_clear(&endpoint->remote_condition);
     pn_modified(conn, endpoint);
     endpoint = endpoint->endpoint_next;
   }
@@ -1368,7 +1347,10 @@ void pn_delivery_settle(pn_delivery_t *d
 
 int pn_post_close(pn_transport_t *transport, const char *condition)
 {
-  pn_condition_t *cond = pn_connection_condition(transport->connection);
+  pn_condition_t *cond = NULL;
+  if (transport->connection) {
+    cond = pn_connection_condition(transport->connection);
+  }
   const char *description = NULL;
   pn_data_t *info = NULL;
   if (!condition && pn_condition_is_set(cond)) {
@@ -1759,6 +1741,20 @@ int pn_do_disposition(pn_dispatcher_t *d
   return 0;
 }
 
+static int pn_scan_error(pn_dispatcher_t *disp, pn_condition_t *condition, bool detach)
+{
+  pn_bytes_t cond;
+  pn_bytes_t desc;
+  pn_condition_clear(condition);
+  int err = pn_scan_args(disp, detach ? "D.[..D.[sSC]" : "D.[D.[sSC]",
+                         &cond, &desc, condition->info);
+  if (err) return err;
+  strncat(condition->name, cond.start, cond.size);
+  strncat(condition->description, desc.start, desc.size);
+  pn_data_rewind(condition->info);
+  return 0;
+}
+
 int pn_do_detach(pn_dispatcher_t *disp)
 {
   pn_transport_t *transport = (pn_transport_t *) disp->context;
@@ -1774,6 +1770,9 @@ int pn_do_detach(pn_dispatcher_t *disp)
   pn_link_state_t *link_state = pn_handle_state(ssn_state, handle);
   pn_link_t *link = link_state->link;
 
+  err = pn_scan_error(disp, &link->endpoint.remote_condition, true);
+  if (err) return err;
+
   link_state->remote_handle = -2;
 
   if (closed)
@@ -1791,30 +1790,18 @@ int pn_do_end(pn_dispatcher_t *disp)
   pn_transport_t *transport = (pn_transport_t *) disp->context;
   pn_session_state_t *ssn_state = pn_channel_state(transport, disp->channel);
   pn_session_t *session = ssn_state->session;
-
+  int err = pn_scan_error(disp, &session->endpoint.remote_condition, false);
+  if (err) return err;
   ssn_state->remote_channel = -2;
   PN_SET_REMOTE(session->endpoint.state, PN_REMOTE_CLOSED);
   return 0;
 }
 
-static int pn_scan_error(pn_dispatcher_t *disp, pn_condition_t *condition)
-{
-  pn_bytes_t cond;
-  pn_bytes_t desc;
-  pn_condition_clear(condition);
-  int err = pn_scan_args(disp, "D.[D.[sSC]", &cond, &desc, condition->info);
-  if (err) return err;
-  strncat(condition->name, cond.start, cond.size);
-  strncat(condition->description, desc.start, desc.size);
-  pn_data_rewind(condition->info);
-  return 0;
-}
-
 int pn_do_close(pn_dispatcher_t *disp)
 {
   pn_transport_t *transport = (pn_transport_t *) disp->context;
   pn_connection_t *conn = transport->connection;
-  int err = pn_scan_error(disp, &transport->remote_condition);
+  int err = pn_scan_error(disp, &transport->remote_condition, false);
   if (err) return err;
   transport->close_rcvd = true;
   PN_SET_REMOTE(conn->endpoint.state, PN_REMOTE_CLOSED);
@@ -2362,8 +2349,19 @@ int pn_process_link_teardown(pn_transpor
           (int32_t) state->remote_handle != -2 &&
           (int16_t) ssn_state->remote_channel != -2 &&
           !transport->close_rcvd) return 0;
-      int err = pn_post_frame(transport->disp, ssn_state->local_channel, "DL[Io]", DETACH,
-                              state->local_handle, true);
+
+      const char *name = NULL;
+      const char *description = NULL;
+      pn_data_t *info = NULL;
+
+      if (pn_condition_is_set(&endpoint->condition)) {
+        name = pn_condition_get_name(&endpoint->condition);
+        description = pn_condition_get_description(&endpoint->condition);
+        info = pn_condition_info(&endpoint->condition);
+      }
+
+      int err = pn_post_frame(transport->disp, ssn_state->local_channel, "DL[Io?DL[sSC]]", DETACH,
+                              state->local_handle, true, (bool) name, ERROR, name, description, info);
       if (err) return err;
       state->local_handle = -2;
     }
@@ -2410,7 +2408,19 @@ int pn_process_ssn_teardown(pn_transport
         && !transport->close_sent)
     {
       if (pn_pointful_buffering(transport, session)) return 0;
-      int err = pn_post_frame(transport->disp, state->local_channel, "DL[]", END);
+
+      const char *name = NULL;
+      const char *description = NULL;
+      pn_data_t *info = NULL;
+
+      if (pn_condition_is_set(&endpoint->condition)) {
+        name = pn_condition_get_name(&endpoint->condition);
+        description = pn_condition_get_description(&endpoint->condition);
+        info = pn_condition_info(&endpoint->condition);
+      }
+
+      int err = pn_post_frame(transport->disp, state->local_channel, "DL[?DL[sSC]]", END,
+                              (bool) name, ERROR, name, description, info);
       if (err) return err;
       state->local_channel = -2;
     }
@@ -2765,15 +2775,41 @@ bool pn_delivery_partial(pn_delivery_t *
 
 pn_condition_t *pn_connection_condition(pn_connection_t *connection)
 {
+  assert(connection);
   return &connection->endpoint.condition;
 }
 
 pn_condition_t *pn_connection_remote_condition(pn_connection_t *connection)
 {
+  assert(connection);
   pn_transport_t *transport = connection->transport;
   return transport ? &transport->remote_condition : NULL;
 }
 
+pn_condition_t *pn_session_condition(pn_session_t *session)
+{
+  assert(session);
+  return &session->endpoint.condition;
+}
+
+pn_condition_t *pn_session_remote_condition(pn_session_t *session)
+{
+  assert(session);
+  return &session->endpoint.remote_condition;
+}
+
+pn_condition_t *pn_link_condition(pn_link_t *link)
+{
+  assert(link);
+  return &link->endpoint.condition;
+}
+
+pn_condition_t *pn_link_remote_condition(pn_link_t *link)
+{
+  assert(link);
+  return &link->endpoint.remote_condition;
+}
+
 bool pn_condition_is_set(pn_condition_t *condition)
 {
   return condition && condition->name[0];
@@ -2838,3 +2874,35 @@ bool pn_condition_is_redirect(pn_conditi
   const char *name = pn_condition_get_name(condition);
   return name && !strcmp(name, "amqp:connection:redirect");
 }
+
+const char *pn_condition_redirect_host(pn_condition_t *condition)
+{
+  pn_data_t *data = pn_condition_info(condition);
+  pn_data_rewind(data);
+  pn_data_next(data);
+  pn_data_enter(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_bytes_t host = pn_data_get_bytes(data);
+  pn_data_rewind(data);
+  return host.start;
+}
+
+int pn_condition_redirect_port(pn_condition_t *condition)
+{
+  pn_data_t *data = pn_condition_info(condition);
+  pn_data_rewind(data);
+  pn_data_next(data);
+  pn_data_enter(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  pn_data_next(data);
+  int port = pn_data_get_int(data);
+  pn_data_rewind(data);
+  return port;
+}

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/message/message.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/message/message.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/message/message.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/message/message.c Tue Dec 18 15:58:59 2012
@@ -536,6 +536,8 @@ int pn_message_decode(pn_message_t *msg,
       err = pn_data_copy(msg->body, msg->data);
       if (err) return err;
       break;
+    case FOOTER:
+      break;
     default:
       err = pn_data_copy(msg->body, msg->data);
       if (err) return err;

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/messenger.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/messenger.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/messenger.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/messenger.c Tue Dec 18 15:58:59 2012
@@ -67,6 +67,16 @@ struct pn_subscription_t {
   void *context;
 };
 
+typedef struct {
+  int refcount;
+  char *address;
+  char *scheme;
+  char *user;
+  char *pass;
+  char *host;
+  char *port;
+} pn_connection_ctx_t;
+
 void pn_queue_init(pn_queue_t *queue)
 {
   queue->capacity = 1024;
@@ -110,18 +120,24 @@ void pn_queue_gc(pn_queue_t *queue)
   queue->lwm += delta;
 }
 
-void pn_incref(pn_connection_t *conn)
+static void pn_incref(pn_connection_t *conn)
 {
-  intptr_t refcount = (intptr_t) pn_connection_get_context(conn);
-  pn_connection_set_context(conn, (void *) (refcount + 1));
+  pn_connection_ctx_t *ctx = pn_connection_get_context(conn);
+  ctx->refcount++;
 }
 
-void pn_decref(pn_connection_t *conn)
+static void pn_decref(pn_connection_t *conn)
 {
-  intptr_t refcount = (intptr_t) pn_connection_get_context(conn);
-  pn_connection_set_context(conn, (void *) (refcount - 1));
-  if (refcount == 1) {
+  pn_connection_ctx_t *ctx = pn_connection_get_context(conn);
+  ctx->refcount--;
+  if (ctx->refcount == 0) {
     pn_connection_free(conn);
+    free(ctx->scheme);
+    free(ctx->user);
+    free(ctx->pass);
+    free(ctx->host);
+    free(ctx->port);
+    free(ctx);
   }
 }
 
@@ -391,9 +407,58 @@ void pn_messenger_flow(pn_messenger_t *m
   }
 }
 
+static void pn_transport_config(pn_messenger_t *messenger,
+                                pn_connector_t *connector,
+                                pn_connection_t *connection)
+{
+  pn_connection_ctx_t *ctx = pn_connection_get_context(connection);
+  pn_transport_t *transport = pn_connector_transport(connector);
+  if (ctx->scheme && !strcmp(ctx->scheme, "amqps")) {
+    pn_ssl_domain_t *d = pn_ssl_domain( PN_SSL_MODE_CLIENT );
+    if (messenger->certificate && messenger->private_key) {
+      pn_ssl_domain_set_credentials( d, messenger->certificate,
+                                     messenger->private_key,
+                                     messenger->password);
+    }
+    if (messenger->trusted_certificates) {
+      pn_ssl_domain_set_trusted_ca_db(d, messenger->trusted_certificates);
+      pn_ssl_domain_set_peer_authentication(d, PN_SSL_VERIFY_PEER, NULL);
+    } else {
+      pn_ssl_domain_set_peer_authentication(d, PN_SSL_ANONYMOUS_PEER, NULL);
+    }
+    pn_ssl_t *ssl = pn_ssl(transport);
+    pn_ssl_init(ssl, d, NULL);
+    pn_ssl_domain_free( d );
+  }
+
+  pn_sasl_t *sasl = pn_sasl(transport);
+  if (ctx->user) {
+    pn_sasl_plain(sasl, ctx->user, ctx->pass);
+  } else {
+    pn_sasl_mechanisms(sasl, "ANONYMOUS");
+    pn_sasl_client(sasl);
+  }
+}
+
+static void pn_condition_report(const char *pfx, pn_condition_t *condition)
+{
+  if (pn_condition_is_redirect(condition)) {
+    fprintf(stderr, "%s NOTICE (%s) redirecting to %s:%i\n",
+            pfx,
+            pn_condition_get_name(condition),
+            pn_condition_redirect_host(condition),
+            pn_condition_redirect_port(condition));
+  } else if (pn_condition_is_set(condition)) {
+    fprintf(stderr, "%s ERROR (%s) %s\n",
+            pfx,
+            pn_condition_get_name(condition),
+            pn_condition_get_description(condition));
+  }
+}
+
 void pn_messenger_endpoints(pn_messenger_t *messenger, pn_connection_t *conn, pn_connector_t *ctor)
 {
-  if (pn_connection_state(conn) | PN_LOCAL_UNINIT) {
+  if (pn_connection_state(conn) & PN_LOCAL_UNINIT) {
     pn_connection_open(conn);
   }
 
@@ -435,18 +500,36 @@ void pn_messenger_endpoints(pn_messenger
 
   ssn = pn_session_head(conn, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED);
   while (ssn) {
+    pn_condition_report("SESSION", pn_session_remote_condition(ssn));
     pn_session_close(ssn);
     ssn = pn_session_next(ssn, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED);
   }
 
   link = pn_link_head(conn, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED);
   while (link) {
+    pn_condition_report("LINK", pn_link_remote_condition(link));
     pn_link_close(link);
     link = pn_link_next(link, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED);
   }
 
   if (pn_connection_state(conn) == (PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)) {
+    pn_condition_t *condition = pn_connection_remote_condition(conn);
+    pn_condition_report("CONNECTION", condition);
     pn_connection_close(conn);
+    if (pn_condition_is_redirect(condition)) {
+      const char *host = pn_condition_redirect_host(condition);
+      char buf[1024];
+      sprintf(buf, "%i", pn_condition_redirect_port(condition));
+
+      pn_connector_process(ctor);
+      pn_connector_set_connection(ctor, NULL);
+      pn_driver_t *driver = messenger->driver;
+      pn_connector_t *connector = pn_connector(driver, host, buf, NULL);
+      pn_transport_unbind(pn_connector_transport(ctor));
+      pn_connection_reset(conn);
+      pn_transport_config(messenger, connector, conn);
+      pn_connector_set_connection(connector, conn);
+    }
   }
 }
 
@@ -463,6 +546,31 @@ void pn_messenger_reclaim(pn_messenger_t
   }
 }
 
+
+pn_connection_t *pn_messenger_connection(pn_messenger_t *messenger,
+                                         char *scheme,
+                                         char *user,
+                                         char *pass,
+                                         char *host,
+                                         char *port)
+{
+  pn_connection_t *connection = pn_connection();
+  if (!connection) return NULL;
+  pn_connection_ctx_t *ctx = malloc(sizeof(pn_connection_ctx_t));
+  ctx->refcount = 0;
+  ctx->scheme = pn_strdup(scheme);
+  ctx->user = pn_strdup(user);
+  ctx->pass = pn_strdup(pass);
+  ctx->host = pn_strdup(host);
+  ctx->port = pn_strdup(port);
+  pn_connection_set_context(connection, ctx);
+  pn_incref(connection);
+
+  pn_connection_set_container(connection, messenger->name);
+  pn_connection_set_hostname(connection, ctx->host);
+  return connection;
+}
+
 int pn_messenger_tsync(pn_messenger_t *messenger, bool (*predicate)(pn_messenger_t *), int timeout)
 {
   pn_connector_t *ctor = pn_connector_head(messenger->driver);
@@ -508,9 +616,8 @@ int pn_messenger_tsync(pn_messenger_t *m
       pn_sasl_mechanisms(sasl, "ANONYMOUS");
       pn_sasl_server(sasl);
       pn_sasl_done(sasl, PN_SASL_OK);
-      pn_connection_t *conn = pn_connection();
-      pn_incref(conn);
-      pn_connection_set_container(conn, messenger->name);
+      pn_connection_t *conn =
+        pn_messenger_connection(messenger, scheme, NULL, NULL, NULL, NULL);
       pn_connector_set_connection(c, conn);
     }
 
@@ -521,9 +628,11 @@ int pn_messenger_tsync(pn_messenger_t *m
       pn_messenger_endpoints(messenger, conn, c);
       if (pn_connector_closed(c)) {
         pn_connector_free(c);
-        pn_messenger_reclaim(messenger, conn);
-        pn_decref(conn);
-        pn_messenger_flow(messenger);
+        if (conn) {
+          pn_messenger_reclaim(messenger, conn);
+          pn_decref(conn);
+          pn_messenger_flow(messenger);
+        }
       } else {
         pn_connector_process(c);
       }
@@ -593,7 +702,6 @@ static const char *default_port(const ch
   else
     return "5672";
 }
-
 pn_connection_t *pn_messenger_resolve(pn_messenger_t *messenger, char *address, char **name)
 {
   char domain[strlen(address) + 1];
@@ -619,10 +727,16 @@ pn_connection_t *pn_messenger_resolve(pn
   pn_connector_t *ctor = pn_connector_head(messenger->driver);
   while (ctor) {
     pn_connection_t *connection = pn_connector_connection(ctor);
+    pn_connection_ctx_t *ctx = pn_connection_get_context(connection);
+    if (pn_streq(scheme, ctx->scheme) && pn_streq(user, ctx->user) &&
+        pn_streq(pass, ctx->pass) && pn_streq(host, ctx->host) &&
+        pn_streq(port, ctx->port)) {
+      return connection;
+    }
     const char *container = pn_connection_remote_container(connection);
-    const char *hostname = pn_connection_get_hostname(connection);
-    if (pn_streq(container, domain) || pn_streq(hostname, domain))
+    if (pn_streq(container, domain)) {
       return connection;
+    }
     ctor = pn_connector_next(ctor);
   }
 
@@ -630,36 +744,9 @@ pn_connection_t *pn_messenger_resolve(pn
                                            port ? port : default_port(scheme),
                                            NULL);
   if (!connector) return NULL;
-  pn_transport_t *transport = pn_connector_transport(connector);
-  if (scheme && !strcmp(scheme, "amqps")) {
-    pn_ssl_domain_t *d = pn_ssl_domain( PN_SSL_MODE_CLIENT );
-    if (messenger->certificate && messenger->private_key) {
-      pn_ssl_domain_set_credentials( d, messenger->certificate,
-                                     messenger->private_key,
-                                     messenger->password);
-    }
-    if (messenger->trusted_certificates) {
-      pn_ssl_domain_set_trusted_ca_db(d, messenger->trusted_certificates);
-      pn_ssl_domain_set_peer_authentication(d, PN_SSL_VERIFY_PEER, NULL);
-    } else {
-      pn_ssl_domain_set_peer_authentication(d, PN_SSL_ANONYMOUS_PEER, NULL);
-    }
-    pn_ssl_t *ssl = pn_ssl(transport);
-    pn_ssl_init(ssl, d, NULL);
-    pn_ssl_domain_free( d );
-  }
-
-  pn_sasl_t *sasl = pn_sasl(transport);
-  if (user) {
-    pn_sasl_plain(sasl, user, pass);
-  } else {
-    pn_sasl_mechanisms(sasl, "ANONYMOUS");
-    pn_sasl_client(sasl);
-  }
-  pn_connection_t *connection = pn_connection();
-  pn_incref(connection);
-  pn_connection_set_container(connection, messenger->name);
-  pn_connection_set_hostname(connection, domain);
+  pn_connection_t *connection =
+    pn_messenger_connection(messenger, scheme, user, pass, host, port);
+  pn_transport_config(messenger, connector, connection);
   pn_connection_open(connection);
   pn_connector_set_connection(connector, connection);
 
@@ -1138,4 +1225,3 @@ int pn_messenger_incoming(pn_messenger_t
 {
   return pn_messenger_queued(messenger, false);
 }
-

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/openssl.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/openssl.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/openssl.c Tue Dec 18 15:58:59 2012
@@ -29,6 +29,7 @@
 #include <openssl/ssl.h>
 #include <openssl/dh.h>
 #include <openssl/err.h>
+#include <openssl/x509v3.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -42,6 +43,7 @@
  */
 
 static int ssl_initialized;
+static int ssl_ex_data_index;
 
 typedef enum { UNKNOWN_CONNECTION, SSL_CONNECTION, CLEAR_CONNECTION } connection_mode_t;
 typedef struct pn_ssl_session_t pn_ssl_session_t;
@@ -72,6 +74,7 @@ struct pn_ssl_t {
   pn_transport_t   *transport;
   pn_ssl_domain_t  *domain;
   const char    *session_id;
+  const char *peer_hostname;
   SSL *ssl;
 
   BIO *bio_ssl;         // i/o from/to SSL socket layer
@@ -191,55 +194,144 @@ static int ssl_failed(pn_ssl_t *ssl)
   return pn_error_format( ssl->transport->error, PN_ERR, "SSL Failure: %s", buf );
 }
 
-// @todo replace with a "reasonable" default (?), allow application to register its own
-// callback.
-#if 0
+/* match the DNS name pattern from the peer certificate against our configured peer
+   hostname */
+static bool match_dns_pattern( const char *hostname,
+                               const char *pattern, int plen )
+{
+
+  if (memchr( pattern, '*', plen ) == NULL)
+    return (plen == strlen(hostname) &&
+            strncasecmp( pattern, hostname, plen ) == 0);
+
+  /* dns wildcarded pattern - RFC2818 */
+  char plabel[64];   /* max label length < 63 - RFC1034 */
+  char slabel[64];
+  int slen = strlen(hostname);
+
+  while (plen > 0 && slen > 0) {
+    const char *cptr;
+    int len;
+
+    cptr = memchr( pattern, '.', plen );
+    len = (cptr) ? cptr - pattern : plen;
+    if (len > sizeof(plabel) - 1) return false;
+    memcpy( plabel, pattern, len );
+    plabel[len] = 0;
+    pattern = cptr + 1;
+    plen -= len;
+
+    cptr = memchr( hostname, '.', slen );
+    len = (cptr) ? cptr - hostname : slen;
+    if (len > sizeof(slabel) - 1) return false;
+    memcpy( slabel, hostname, len );
+    slabel[len] = 0;
+    hostname = cptr + 1;
+    slen -= len;
+
+    char *star = strchr( plabel, '*' );
+    if (!star) {
+      if (strcasecmp( plabel, slabel )) return false;
+    } else {
+      *star = '\0';
+      char *prefix = plabel;
+      int prefix_len = strlen(prefix);
+      char *suffix = star + 1;
+      int suffix_len = strlen(suffix);
+      if (prefix_len && strncasecmp( prefix, slabel, prefix_len )) return false;
+      if (suffix_len && strncasecmp( suffix,
+                                     slabel + (strlen(slabel) - suffix_len),
+                                     suffix_len )) return false;
+    }
+  }
+
+  return plen == slen;
+}
+
+// Certificate chain verification callback: return 1 if verified,
+// 0 if remote cannot be verified (fail handshake).
+//
 static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 {
-    fprintf(stderr, "VERIFY_CALLBACK: pre-verify-ok=%d\n", preverify_ok);
+  if (!preverify_ok || X509_STORE_CTX_get_error_depth(ctx) != 0)
+    // already failed, or not at peer cert in chain
+    return preverify_ok;
+
+  X509 *cert = X509_STORE_CTX_get_current_cert(ctx);
+  SSL *ssn = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
+  if (!ssn) {
+    _log_error("Error: unexpected error - SSL session info not available for peer verify!\n");
+    return 0;  // fail connection
+  }
+
+  pn_ssl_t *ssl = (pn_ssl_t *)SSL_get_ex_data(ssn, ssl_ex_data_index);
+  if (!ssl) {
+    _log_error("Error: unexpected error - SSL context info not available for peer verify!\n");
+    return 0;  // fail connection
+  }
+
+  if (ssl->domain->verify_mode != PN_SSL_VERIFY_PEER_NAME) return preverify_ok;
+  if (!ssl->peer_hostname) {
+    _log_error("Error: configuration error: PN_SSL_VERIFY_PEER_NAME configured, but no peer hostname set!\n");
+    return 0;  // fail connection
+  }
+
+  _log( ssl, "Checking identifying name in peer cert against '%s'\n", ssl->peer_hostname);
+
+  bool matched = false;
+
+  /* first check any SubjectAltName entries, as per RFC2818 */
+  GENERAL_NAMES *sans = (GENERAL_NAMES *) X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
+  if (sans) {
+    int name_ct = sk_GENERAL_NAME_num( sans );
+    int i;
+    for (i = 0; !matched && i < name_ct; ++i) {
+      GENERAL_NAME *name = sk_GENERAL_NAME_value( sans, i );
+      if (name->type == GEN_DNS) {
+        ASN1_STRING *asn1 = name->d.dNSName;
+        if (asn1 && asn1->data && asn1->length) {
+          unsigned char *str;
+          int len = ASN1_STRING_to_UTF8( &str, asn1 );
+          if (len >= 0) {
+            _log( ssl, "SubjectAltName (dns) from peer cert = '%.*s'\n", len, str );
+            matched = match_dns_pattern( ssl->peer_hostname, (const char *)str, len );
+            OPENSSL_free( str );
+          }
+        }
+      }
+    }
+    GENERAL_NAMES_free( sans );
+  }
 
-           char    buf[256];
-           X509   *err_cert;
-           int     err, depth;
-
-           err_cert = X509_STORE_CTX_get_current_cert(ctx);
-           err = X509_STORE_CTX_get_error(ctx);
-           depth = X509_STORE_CTX_get_error_depth(ctx);
-
-           /*
-            * Retrieve the pointer to the SSL of the connection currently treated
-            * and the application specific data stored into the SSL object.
-            */
-
-           X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256);
-
-           /*
-            * Catch a too long certificate chain. The depth limit set using
-            * SSL_CTX_set_verify_depth() is by purpose set to "limit+1" so
-            * that whenever the "depth>verify_depth" condition is met, we
-            * have violated the limit and want to log this error condition.
-            * We must do it here, because the CHAIN_TOO_LONG error would not
-            * be found explicitly; only errors introduced by cutting off the
-            * additional certificates would be logged.
-            */
-           if (!preverify_ok) {
-               printf("verify error:num=%d:%s:depth=%d:%s\n", err,
-                        X509_verify_cert_error_string(err), depth, buf);
-           }
-
-           /*
-            * At this point, err contains the last verification error. We can use
-            * it for something special
-            */
-           if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT))
-           {
-             X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
-             printf("issuer= %s\n", buf);
-           }
+  /* if no general names match, try the CommonName from the subject */
+  X509_NAME *name = X509_get_subject_name(cert);
+  int i = -1;
+  while (!matched && (i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0) {
+    X509_NAME_ENTRY *ne = X509_NAME_get_entry(name, i);
+    ASN1_STRING *name_asn1 = X509_NAME_ENTRY_get_data(ne);
+    if (name_asn1) {
+      unsigned char *str;
+      int len = ASN1_STRING_to_UTF8( &str, name_asn1);
+      if (len >= 0) {
+        _log( ssl, "commonName from peer cert = '%.*s'\n", len, str );
+        matched = match_dns_pattern( ssl->peer_hostname, (const char *)str, len );
+        OPENSSL_free(str);
+      }
+    }
+  }
 
-    return 1;
-}
+  if (!matched) {
+    _log( ssl, "Error: no name matching %s found in peer cert - rejecting handshake.\n",
+          ssl->peer_hostname);
+    preverify_ok = 0;
+#ifdef X509_V_ERR_APPLICATION_VERIFICATION
+    X509_STORE_CTX_set_error( ctx, X509_V_ERR_APPLICATION_VERIFICATION );
 #endif
+  } else {
+    _log( ssl, "Name from peer cert matched - peer is valid.\n" );
+  }
+  return preverify_ok;
+}
 
 
 // this code was generated using the command:
@@ -326,6 +418,8 @@ pn_ssl_domain_t *pn_ssl_domain( pn_ssl_m
     SSL_library_init();
     SSL_load_error_strings();
     OpenSSL_add_all_algorithms();
+    ssl_ex_data_index = SSL_get_ex_new_index( 0, "org.apache.qpid.proton.ssl",
+                                              NULL, NULL, NULL);
   }
 
   pn_ssl_domain_t *domain = calloc(1, sizeof(pn_ssl_domain_t));
@@ -487,6 +581,7 @@ int pn_ssl_domain_set_peer_authenticatio
 
   switch (mode) {
   case PN_SSL_VERIFY_PEER:
+  case PN_SSL_VERIFY_PEER_NAME:
 
     if (!domain->has_ca_db) {
       _log_error("Error: cannot verify peer without a trusted CA configured.\n"
@@ -518,8 +613,8 @@ int pn_ssl_domain_set_peer_authenticatio
       }
     }
 
-    SSL_CTX_set_verify( domain->ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
-    // verify_callback /*?verify callback?*/ );
+    SSL_CTX_set_verify( domain->ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
+                        verify_callback);
 #if (OPENSSL_VERSION_NUMBER < 0x00905100L)
     SSL_CTX_set_verify_depth(domain->ctx, 1);
 #endif
@@ -610,6 +705,7 @@ void pn_ssl_free( pn_ssl_t *ssl)
   release_ssl_socket( ssl );
   if (ssl->domain) pn_ssl_domain_free(ssl->domain);
   if (ssl->session_id) free((void *)ssl->session_id);
+  if (ssl->peer_hostname) free((void *)ssl->peer_hostname);
 
   free(ssl);
 }
@@ -935,6 +1031,15 @@ static int init_ssl_socket( pn_ssl_t *ss
     return -1;
   }
 
+  // store backpointer to pn_ssl_t in SSL object:
+  SSL_set_ex_data(ssl->ssl, ssl_ex_data_index, ssl);
+
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+  if (ssl->peer_hostname && ssl->domain->mode == PN_SSL_MODE_CLIENT) {
+    SSL_set_tlsext_host_name(ssl->ssl, ssl->peer_hostname);
+  }
+#endif
+
   // restore session, if available
   if (ssl->session_id) {
     pn_ssl_session_t *ssn = ssn_cache_find( ssl->domain, ssl->session_id );
@@ -1096,6 +1201,7 @@ void pn_ssl_trace(pn_ssl_t *ssl, pn_trac
   ssl->trace = trace;
 }
 
+
 pn_ssl_resume_status_t pn_ssl_resume_status( pn_ssl_t *ssl )
 {
   if (!ssl || !ssl->ssl) return PN_SSL_RESUME_UNKNOWN;
@@ -1107,3 +1213,38 @@ pn_ssl_resume_status_t pn_ssl_resume_sta
   return PN_SSL_RESUME_UNKNOWN;
 }
 
+
+int pn_ssl_set_peer_hostname( pn_ssl_t *ssl, const char *hostname )
+{
+  if (!ssl) return -1;
+
+  if (ssl->peer_hostname) free((void *)ssl->peer_hostname);
+  ssl->peer_hostname = NULL;
+  if (hostname) {
+    ssl->peer_hostname = pn_strdup(hostname);
+    if (!ssl->peer_hostname) return -2;
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+    if (ssl->ssl && ssl->domain && ssl->domain->mode == PN_SSL_MODE_CLIENT) {
+      SSL_set_tlsext_host_name(ssl->ssl, ssl->peer_hostname);
+    }
+#endif
+  }
+  return 0;
+}
+
+int pn_ssl_get_peer_hostname( pn_ssl_t *ssl, char *hostname, size_t *bufsize )
+{
+  if (!ssl) return -1;
+  if (!ssl->peer_hostname) {
+    *bufsize = 0;
+    if (hostname) *hostname = '\0';
+    return 0;
+  }
+  int len = strlen(ssl->peer_hostname);
+  if (hostname) {
+    if (len >= *bufsize) return -1;
+    strcpy( hostname, ssl->peer_hostname );
+  }
+  *bufsize = len;
+  return 0;
+}

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/ssl_stub.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/ssl_stub.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/ssl_stub.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/ssl/ssl_stub.c Tue Dec 18 15:58:59 2012
@@ -109,3 +109,12 @@ pn_ssl_resume_status_t pn_ssl_resume_sta
   return PN_SSL_RESUME_UNKNOWN;
 }
 
+int pn_ssl_set_peer_hostname( pn_ssl_t *ssl, const char *hostname)
+{
+  return -1;
+}
+
+int pn_ssl_get_peer_hostname( pn_ssl_t *ssl, char *hostname, size_t *bufsize )
+{
+  return -1;
+}

Modified: qpid/proton/branches/kgiusti-proton-136/proton-c/src/util.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-c/src/util.c?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-c/src/util.c (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-c/src/util.c Tue Dec 18 15:58:59 2012
@@ -132,11 +132,20 @@ void pn_fatal(char *fmt, ...)
   va_end(ap);
 }
 
+static bool pn_i_eq_nocase(const char *a, const char *b)
+{
+    while (*b) {
+        if (tolower(*a++) != tolower(*b++))
+            return false;
+    }
+    return !(*a);
+}
+
 bool pn_env_bool(const char *name)
 {
   char *v = getenv(name);
-  return v && (!strcasecmp(v, "true") || !strcasecmp(v, "1") ||
-               !strcasecmp(v, "yes"));
+  return v && (pn_i_eq_nocase(v, "true") || pn_i_eq_nocase(v, "1") ||
+               pn_i_eq_nocase(v, "yes") || pn_i_eq_nocase(v, "on"));
 }
 
 char *pn_strdup(const char *src)

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/AmqpSender.java Tue Dec 18 15:58:59 2012
@@ -76,7 +76,7 @@ public class AmqpSender extends AmqpLink
     final LinkedList<MessageDelivery> outbound = new LinkedList<MessageDelivery>();
     long outboundBufferSize;
 
-    public MessageDelivery send(MessageImpl message) {
+    public MessageDelivery send(Message message) {
         assertExecuting();
         MessageDelivery rc = new MessageDelivery(message) {
             @Override

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/api/MessageDelivery.java Tue Dec 18 15:58:59 2012
@@ -17,44 +17,38 @@
 
 package org.apache.qpid.proton.hawtdispatch.api;
 
-import org.apache.qpid.proton.hawtdispatch.impl.DroppingWritableBuffer;
+import org.apache.qpid.proton.amqp.transport.DeliveryState;
+import org.apache.qpid.proton.engine.impl.DeliveryImpl;
 import org.apache.qpid.proton.hawtdispatch.impl.Watch;
 import org.apache.qpid.proton.hawtdispatch.impl.WatchBase;
-import org.apache.qpid.proton.codec.CompositeWritableBuffer;
-import org.apache.qpid.proton.codec.WritableBuffer;
-import org.apache.qpid.proton.engine.impl.DeliveryImpl;
 import org.apache.qpid.proton.message.Message;
-import org.apache.qpid.proton.amqp.transport.DeliveryState;
 import org.apache.qpid.proton.message.impl.MessageImpl;
 import org.fusesource.hawtbuf.Buffer;
 import org.fusesource.hawtdispatch.Task;
 
-import java.nio.ByteBuffer;
-
 /**
  * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
 public abstract class MessageDelivery extends WatchBase {
 
     final int initialSize;
-    private MessageImpl message;
+    private Message message;
     private Buffer encoded;
     public DeliveryImpl delivery;
     private int sizeHint = 1024*4;
 
-    static Buffer encode(MessageImpl message, int sizeHint) {
-        ByteBuffer buffer = ByteBuffer.wrap(new byte[sizeHint]);
-        DroppingWritableBuffer overflow = new DroppingWritableBuffer();
-        int c = message.encode(new CompositeWritableBuffer(new WritableBuffer.ByteBufferWrapper(buffer), overflow));
-        if( overflow.position() > 0 ) {
-            buffer = ByteBuffer.wrap(new byte[sizeHint+overflow.position()]);
-            c = message.encode(new WritableBuffer.ByteBufferWrapper(buffer));
+    static Buffer encode(Message message, int sizeHint) {
+        byte[] buffer = new byte[sizeHint];
+        int size = ((MessageImpl)message).encode2(buffer, 0, sizeHint);
+        if( size > sizeHint ) {
+            buffer = new byte[size];
+            size = message.encode(buffer, 0, size);
         }
-        return new Buffer(buffer.array(), 0, c);
+        return new Buffer(buffer, 0, size);
     }
 
-    static MessageImpl decode(Buffer buffer) {
-        MessageImpl msg = new MessageImpl();
+    static Message decode(Buffer buffer) {
+        Message msg = new MessageImpl();
         int offset = buffer.offset;
         int len = buffer.length;
         while( len > 0 ) {
@@ -66,7 +60,7 @@ public abstract class MessageDelivery ex
         return msg;
     }
 
-    public MessageDelivery(MessageImpl message) {
+    public MessageDelivery(Message message) {
         this(message, encode(message, 1024*4));
     }
 
@@ -74,7 +68,7 @@ public abstract class MessageDelivery ex
         this(null, encoded);
     }
 
-    public MessageDelivery(MessageImpl message, Buffer encoded) {
+    public MessageDelivery(Message message, Buffer encoded) {
         this.message = message;
         this.encoded = encoded;
         sizeHint = this.encoded.length;

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/AMQPNativeOutboundTransformer.java Tue Dec 18 15:58:59 2012
@@ -17,6 +17,7 @@
 package org.apache.qpid.proton.jms;
 
 import org.apache.qpid.proton.codec.CompositeWritableBuffer;
+import org.apache.qpid.proton.codec.DroppingWritableBuffer;
 import org.apache.qpid.proton.codec.WritableBuffer;
 import org.apache.qpid.proton.amqp.UnsignedInteger;
 

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/contrib/proton-jms/src/main/java/org/apache/qpid/proton/jms/JMSMappingOutboundTransformer.java Tue Dec 18 15:58:59 2012
@@ -19,6 +19,7 @@ package org.apache.qpid.proton.jms;
 import org.apache.qpid.proton.amqp.messaging.Section;
 import org.apache.qpid.proton.codec.CompositeWritableBuffer;
 import org.apache.qpid.proton.codec.WritableBuffer;
+import org.apache.qpid.proton.codec.DroppingWritableBuffer;
 import org.apache.qpid.proton.amqp.Binary;
 import org.apache.qpid.proton.amqp.Symbol;
 import org.apache.qpid.proton.amqp.UnsignedByte;

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java Tue Dec 18 15:58:59 2012
@@ -23,11 +23,12 @@ package org.apache.qpid.proton.engine.im
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.security.Key;
 import java.security.KeyManagementException;
+import java.security.KeyPair;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
 import java.security.Security;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
@@ -228,7 +229,7 @@ public class SslEngineFacadeFactory
                 {
                     _logger.log(Level.FINE, "_sslParams.getTrustedCaDb() : " + sslDomain.getTrustedCaDb());
                 }
-                Certificate trustedCaCert = (Certificate) readPemObject(sslDomain.getTrustedCaDb());
+                Certificate trustedCaCert = (Certificate) readPemObject(sslDomain.getTrustedCaDb(), null, Certificate.class);
                 keystore.setCertificateEntry(caCertAlias, trustedCaCert);
             }
 
@@ -236,10 +237,25 @@ public class SslEngineFacadeFactory
                     && sslDomain.getPrivateKeyFile() != null)
             {
                 String clientPrivateKeyAlias = "clientPrivateKey";
-                Certificate clientCertificate = (Certificate) readPemObject(sslDomain.getCertificateFile());
-                Key clientPrivateKey = (Key) readPemObject(
+                Certificate clientCertificate = (Certificate) readPemObject(sslDomain.getCertificateFile(), null, Certificate.class);
+                Object keyOrKeyPair = readPemObject(
                         sslDomain.getPrivateKeyFile(),
-                        sslDomain.getPrivateKeyPassword());
+                        sslDomain.getPrivateKeyPassword(), PrivateKey.class, KeyPair.class);
+
+                final PrivateKey clientPrivateKey;
+                if (keyOrKeyPair instanceof PrivateKey)
+                {
+                    clientPrivateKey = (PrivateKey)keyOrKeyPair;
+                }
+                else if (keyOrKeyPair instanceof KeyPair)
+                {
+                    clientPrivateKey = ((KeyPair)keyOrKeyPair).getPrivate();
+                }
+                else
+                {
+                    // Should not happen - readPemObject will have already verified key type
+                    throw new IllegalStateException("Unexpected key type " + keyOrKeyPair);
+                }
 
                 keystore.setKeyEntry(clientPrivateKeyAlias, clientPrivateKey,
                         dummyPassword, new Certificate[] { clientCertificate });
@@ -317,31 +333,40 @@ public class SslEngineFacadeFactory
             .append(" ]").toString();
     }
 
-    private Object readPemObject(String pemFile, final String privateKeyPassword)
+    private Object readPemObject(String pemFile, String keyPassword, @SuppressWarnings("rawtypes") Class... expectedInterfaces)
     {
-        PasswordFinder passwordFinder = new PasswordFinder()
+        final PasswordFinder passwordFinder;
+        if (keyPassword != null)
         {
-            @Override
-            public char[] getPassword()
-            {
-                return privateKeyPassword.toCharArray();
-            }
-        };
+            passwordFinder = getPasswordFinderFor(keyPassword);
+        }
+        else
+        {
+            passwordFinder = null;
+        }
 
         Reader reader = null;
         try
         {
             reader = new FileReader(pemFile);
-            return new PEMReader(reader, privateKeyPassword == null ? null : passwordFinder).readObject();
+            PEMReader pemReader = new PEMReader(reader, passwordFinder);
+            Object pemObject = pemReader.readObject();
+            if (!checkPemObjectIsOfAllowedTypes(pemObject, expectedInterfaces))
+            {
+                throw new IllegalStateException("File " + pemFile + " does not provide a object of the required type."
+                        + " Read an object of class " + pemObject.getClass().getName()
+                        + " whilst expecting an implementation of one of the following  : " + Arrays.asList(expectedInterfaces));
+            }
+            return pemObject;
         }
         catch(PEMException e)
         {
             _logger.log(Level.SEVERE, "Unable to read PEM object. Perhaps you need the unlimited strength libraries in <java-home>/jre/lib/security/ ?", e);
-            throw new RuntimeException(e);
+            throw new IllegalStateException("Unable to read PEM object from file " + pemFile, e);
         }
         catch (IOException e)
         {
-            throw new RuntimeException(e);
+            throw new RuntimeException("Unable to read PEM object from file " + pemFile, e);
         }
         finally
         {
@@ -359,9 +384,35 @@ public class SslEngineFacadeFactory
         }
     }
 
-    private Object readPemObject(String pemFile)
+    @SuppressWarnings("rawtypes")
+    private boolean checkPemObjectIsOfAllowedTypes(Object pemObject,  Class... expectedInterfaces)
+    {
+        if (expectedInterfaces.length == 0)
+        {
+            throw new IllegalArgumentException("Must be at least one expectedKeyTypes");
+        }
+
+        for (Class keyInterface : expectedInterfaces)
+        {
+            if (keyInterface.isInstance(pemObject))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private PasswordFinder getPasswordFinderFor(final String keyPassword)
     {
-        return readPemObject(pemFile, null);
+        PasswordFinder passwordFinder = new PasswordFinder()
+        {
+            @Override
+            public char[] getPassword()
+            {
+                return keyPassword.toCharArray();
+            }
+        };
+        return passwordFinder;
     }
 
     private final class AlwaysTrustingTrustManager implements X509TrustManager

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/java/org/apache/qpid/proton/message/impl/MessageImpl.java Tue Dec 18 15:58:59 2012
@@ -28,10 +28,8 @@ import org.apache.qpid.proton.amqp.Symbo
 import org.apache.qpid.proton.amqp.UnsignedByte;
 import org.apache.qpid.proton.amqp.UnsignedInteger;
 import org.apache.qpid.proton.amqp.messaging.*;
-import org.apache.qpid.proton.codec.AMQPDefinedTypes;
-import org.apache.qpid.proton.codec.DecoderImpl;
-import org.apache.qpid.proton.codec.EncoderImpl;
-import org.apache.qpid.proton.codec.WritableBuffer;
+import org.apache.qpid.proton.amqp.messaging.Data;
+import org.apache.qpid.proton.codec.*;
 import org.apache.qpid.proton.message.*;
 
 public class MessageImpl implements Message
@@ -675,6 +673,17 @@ public class MessageImpl implements Mess
         return encode(new WritableBuffer.ByteBufferWrapper(buffer));
     }
 
+    public int encode2(byte[] data, int offset, int length)
+    {
+        ByteBuffer buffer = ByteBuffer.wrap(data, offset, length);
+        WritableBuffer.ByteBufferWrapper first = new WritableBuffer.ByteBufferWrapper(buffer);
+        DroppingWritableBuffer second = new DroppingWritableBuffer();
+        CompositeWritableBuffer composite = new CompositeWritableBuffer(first, second);
+        int start = composite.position();
+        encode(composite);
+        return composite.position() - start;
+    }
+
     public int encode(WritableBuffer buffer)
     {
         int length = buffer.remaining();

Modified: qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/scripts/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/scripts/proton.py?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/scripts/proton.py (original)
+++ qpid/proton/branches/kgiusti-proton-136/proton-j/proton/src/main/scripts/proton.py Tue Dec 18 15:58:59 2012
@@ -837,6 +837,7 @@ class SSLDomain(object):
   MODE_CLIENT = SslDomain.Mode.CLIENT
   VERIFY_PEER = SslDomain.VerifyMode.VERIFY_PEER
   ANONYMOUS_PEER = SslDomain.VerifyMode.ANONYMOUS_PEER
+  VERIFY_PEER_NAME = None  # TBD
 
   def __init__(self, mode):
     self._domain = SslDomainImpl()
@@ -881,7 +882,14 @@ class SSL(object):
   def protocol_name(self):
     return self._ssl.getProtocolName()
 
+  def _set_peer_hostname(self, hostname):
+    raise Skipped()
+  def _get_peer_hostname(self):
+    raise Skipped()
+  peer_hostname = property(_get_peer_hostname, _set_peer_hostname)
+
 __all__ = [
+           "ACCEPTED",
            "LANGUAGE",
            "MANUAL",
            "PENDING",
@@ -907,8 +915,8 @@ __all__ = [
            "SSLException",
            "SSLSessionDetails",
            "SSLUnavailable",
+           "symbol",
            "Terminus",
            "Timeout",
            "Transport",
-           "TransportException",
-           "symbol"]
+           "TransportException"]

Modified: qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/engine.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/engine.py?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/engine.py (original)
+++ qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/engine.py Tue Dec 18 15:58:59 2012
@@ -200,7 +200,7 @@ class ConnectionTest(Test):
     assert self.c2.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_CLOSED
 
     rcond = self.c2.remote_condition
-    assert rcond == cond
+    assert rcond == cond, (rcond, cond)
 
 class SessionTest(Test):
 
@@ -290,6 +290,28 @@ class SessionTest(Test):
     self.ssn.close()
     self.pump()
 
+  def test_condition(self):
+    self.ssn.open()
+    self.pump()
+    ssn = self.c2.session_head(Endpoint.REMOTE_ACTIVE | Endpoint.LOCAL_UNINIT)
+    assert ssn != None
+    ssn.open()
+    self.pump()
+
+    assert self.ssn.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
+    assert ssn.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
+
+    cond = Condition("blah:bleh", "this is a description", {symbol("foo"): "bar"})
+    self.ssn.condition = cond
+    self.ssn.close()
+
+    self.pump()
+
+    assert self.ssn.state == Endpoint.LOCAL_CLOSED | Endpoint.REMOTE_ACTIVE
+    assert ssn.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_CLOSED
+
+    rcond = ssn.remote_condition
+    assert rcond == cond, (rcond, cond)
 
 class LinkTest(Test):
 
@@ -463,6 +485,26 @@ class LinkTest(Test):
                                             timeout=7,
                                             capabilities=[]))
 
+  def test_condition(self):
+    self.snd.open()
+    self.rcv.open()
+    self.pump()
+
+    assert self.snd.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
+    assert self.rcv.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_ACTIVE
+
+    cond = Condition("blah:bleh", "this is a description", {symbol("foo"): "bar"})
+    self.snd.condition = cond
+    self.snd.close()
+
+    self.pump()
+
+    assert self.snd.state == Endpoint.LOCAL_CLOSED | Endpoint.REMOTE_ACTIVE
+    assert self.rcv.state == Endpoint.LOCAL_ACTIVE | Endpoint.REMOTE_CLOSED
+
+    rcond = self.rcv.remote_condition
+    assert rcond == cond, (rcond, cond)
+
 class TerminusConfig:
 
   def __init__(self, address=None, timeout=None, durability=None, filter=None,

Modified: qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl.py?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl.py (original)
+++ qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl.py Tue Dec 18 15:58:59 2012
@@ -70,6 +70,18 @@ class SslTest(common.Test):
         return os.path.join(os.path.dirname(__file__),
                             "ssl_db/%s" % file)
 
+    def _do_handshake(self, client, server):
+        """ Attempt to connect client to server. Will throw a TransportException if the SSL
+        handshake fails.
+        """
+        client.connection.open()
+        server.connection.open()
+        self._pump(client, server)
+        assert client.ssl.protocol_name() is not None
+        client.connection.close()
+        server.connection.close()
+        self._pump(client, server)
+
     def test_defaults(self):
         """ By default, both the server and the client support anonymous
         ciphers - they should connect without need for a certificate.
@@ -465,3 +477,161 @@ class SslTest(common.Test):
             s[0].connection.close()
             self._pump( s[1], s[0] )
 
+    def test_server_hostname_authentication(self):
+        """ Test authentication of the names held in the server's certificate
+        against various configured hostnames.
+        """
+
+        # Check the CommonName matches (case insensitive).
+        # Assumes certificate contains "CN=A1.Good.Server.domain.com"
+        self.server_domain.set_credentials(self._testpath("server-certificate.pem"),
+                                           self._testpath("server-private-key.pem"),
+                                           "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "a1.good.server.domain.com"
+        assert client.ssl.peer_hostname == "a1.good.server.domain.com"
+        self._do_handshake( client, server )
+        del server
+        del client
+        self.teardown()
+
+        # Should fail on CN name mismatch:
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-certificate.pem"),
+                                           self._testpath("server-private-key.pem"),
+                                           "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "A1.Good.Server.domain.comX"
+        try:
+            self._do_handshake( client, server )
+            assert False, "Expected connection to fail due to hostname mismatch"
+        except TransportException:
+            pass
+        del server
+        del client
+        self.teardown()
+
+        # Wildcarded Certificate
+        # Assumes:
+        #   1) certificate contains Server Alternate Names:
+        #        "alternate.name.one.com" and "another.name.com"
+        #   2) certificate has wildcarded CommonName "*.prefix*.domain.com"
+        #
+
+        # Pass: match an alternate
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                           self._testpath("server-wc-private-key.pem"),
+                                           "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "alternate.Name.one.com"
+        self._do_handshake( client, server )
+        del client
+        del server
+        self.teardown()
+
+        # Pass: match an alternate
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                    self._testpath("server-wc-private-key.pem"),
+                                    "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "ANOTHER.NAME.COM"
+        self._do_handshake(client, server)
+        del client
+        del server
+        self.teardown()
+
+        # Pass: match the pattern
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                    self._testpath("server-wc-private-key.pem"),
+                                    "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "SOME.PREfix.domain.COM"
+        self._do_handshake( client, server )
+        del client
+        del server
+        self.teardown()
+
+        # Pass: match the pattern
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                    self._testpath("server-wc-private-key.pem"),
+                                    "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "FOO.PREfixZZZ.domain.com"
+        self._do_handshake( client, server )
+        del client
+        del server
+        self.teardown()
+
+        # Fail: must match prefix on wildcard
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                    self._testpath("server-wc-private-key.pem"),
+                                    "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "FOO.PREfi.domain.com"
+        try:
+            self._do_handshake( client, server )
+            assert False, "Expected connection to fail due to hostname mismatch"
+        except TransportException:
+            pass
+        del server
+        del client
+        self.teardown()
+
+        # Fail: leading wildcards are not optional
+        self.setup()
+        self.server_domain.set_credentials(self._testpath("server-wc-certificate.pem"),
+                                    self._testpath("server-wc-private-key.pem"),
+                                    "server-password")
+        self.client_domain.set_trusted_ca_db(self._testpath("ca-certificate.pem"))
+        self.client_domain.set_peer_authentication( SSLDomain.VERIFY_PEER_NAME )
+
+        server = SslTest.SslTestConnection( self.server_domain )
+        client = SslTest.SslTestConnection( self.client_domain )
+
+        client.ssl.peer_hostname = "PREfix.domain.COM"
+        try:
+            self._do_handshake( client, server )
+            assert False, "Expected connection to fail due to hostname mismatch"
+        except TransportException:
+            pass
+        self.teardown()

Modified: qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/README.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/README.txt?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/README.txt (original)
+++ qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/README.txt Tue Dec 18 15:58:59 2012
@@ -11,27 +11,52 @@ client-private-key.pem - encrypted key u
 "client-password"
 
 server-certificate.pem - the public certificate used to identify the server.  Signed by
-the CA.
+the CA.  The CommonName is "A1.Good.Server.domain.com", and is checked by some unit tests.
 
 server-private-key.pem - encrypted key used to create server-certificate.pem. Password is
 "server-password"
 
 bad-server-certificate.pem, bad-server-private-key.pem - a certificate/key that is not trusted by the client, for negative test.
 
+server-wc-certificate.pem and server-wc-private-key.pem - similar to
+server-certificate.pem and server-private-key.pem, but contains Subject Alternate Name
+entries, and a wildcard CommonName.  Used for certificate name checking tests.
+
 These certificates have been created using the OpenSSL tool.
 
-The following commands were used to create these certificates:
+The following bash script can be used to create these certificates (requires keytool from Java 1.7, and openssl):
+
+--8<--
+#!/bin/bash
+#set -x
+
+rm -f *.pem *.pkcs12
 
 # Create a self-signed certificate for the CA, and a private key to sign certificate requests:
- openssl req -x509 -newkey rsa:512 -keyout ca-private-key.pem -passout pass:ca-password -out ca-certificate.pem  -days 99999 -subj "/O=Trust Me, Inc/CN=127.0.0.1"
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -genkey -dname "O=Trust Me Inc.,CN=Trusted.CA.com"
+openssl pkcs12 -nokeys -passin pass:ca-password -in ca.pkcs12 -passout pass:ca-password -out ca-certificate.pem
 
 # Create a certificate request for the server certificate.  Use the CA's certificate to sign it:
- openssl req -newkey rsa:512 -keyout server-private-key.pem -passout pass:server-password -out server-request.pem -subj "/O=Server/CN=127.0.0.1"
- openssl x509 -req -in server-request.pem -CA ca-certificate.pem -CAkey ca-private-key.pem -CAcreateserial -passin pass:ca-password -days 99999 -out server-certificate.pem
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -genkey  -dname "O=Server,CN=A1.Good.Server.domain.com"
+keytool -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-certificate -keypass server-password -certreq -file server-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-request.pem -outfile server-certificate.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-private-key.pem
 
 # Create a certificate request for the client certificate.  Use the CA's certificate to sign it:
- openssl req -newkey rsa:512 -keyout client-private-key.pem -passout pass:client-password -out client-request.pem -subj "/O=Client/CN=127.0.0.1"
- openssl x509 -req -in client-request.pem -CA ca-certificate.pem -CAkey ca-private-key.pem -CAcreateserial -passin pass:ca-password -days 99999 -out client-certificate.pem
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -genkey  -dname "O=Client,CN=127.0.0.1"
+keytool -storetype pkcs12 -keystore client.pkcs12 -storepass client-password -alias client-certificate -keypass client-password -certreq -file client-request.pem
+keytool -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile client-request.pem -outfile client-certificate.pem
+openssl pkcs12 -nocerts -passin pass:client-password -in client.pkcs12 -passout pass:client-password -out client-private-key.pem
 
 # Create a "bad" certificate - not signed by a trusted authority
- openssl req -x509 -newkey rsa:512 -keyout bad-server-private-key.pem -passout pass:server-password -out bad-server-certificate.pem  -days 99999 -subj "/O=Not Trusted, Inc/CN=127.0.0.1"
+keytool -storetype pkcs12 -keystore bad-server.pkcs12 -storepass server-password -alias bad-server -keypass server-password -genkey -dname "O=Not Trusted Inc,CN=127.0.0.1"
+openssl pkcs12 -nocerts -passin pass:server-password -in bad-server.pkcs12 -passout pass:server-password -out bad-server-private-key.pem
+openssl pkcs12 -nokeys  -passin pass:server-password -in bad-server.pkcs12 -passout pass:server-password -out bad-server-certificate.pem
+
+# Create a server certificate with several alternate names, including a wildcarded common name:
+keytool -ext san=dns:alternate.name.one.com,dns:another.name.com -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-wc-certificate -keypass server-password -genkeypair -dname "O=Server,CN=*.prefix*.domain.com"
+keytool -ext san=dns:alternate.name.one.com,dns:another.name.com -storetype pkcs12 -keystore server.pkcs12 -storepass server-password -alias server-wc-certificate -keypass server-password -certreq -file server-wc-request.pem
+keytool -ext san=dns:alternate.name.one.com,dns:another.name.com  -storetype pkcs12 -keystore ca.pkcs12 -storepass ca-password -alias ca -keypass ca-password -gencert -rfc -validity 99999 -infile server-wc-request.pem -outfile server-wc-certificate.pem
+openssl pkcs12 -nocerts -passin pass:server-password -in server.pkcs12 -passout pass:server-password -out server-wc-private-key.pem
+
+

Modified: qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-certificate.pem
URL: http://svn.apache.org/viewvc/qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-certificate.pem?rev=1423497&r1=1423496&r2=1423497&view=diff
==============================================================================
--- qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-certificate.pem (original)
+++ qpid/proton/branches/kgiusti-proton-136/tests/proton_tests/ssl_db/bad-server-certificate.pem Tue Dec 18 15:58:59 2012
@@ -1,11 +1,22 @@
+Bag Attributes
+    friendlyName: bad-server
+    localKeyID: 54 69 6D 65 20 31 33 35 35 35 31 33 31 37 36 34 33 38 
+subject=/CN=127.0.0.1/O=Not Trusted Inc
+issuer=/CN=127.0.0.1/O=Not Trusted Inc
 -----BEGIN CERTIFICATE-----
-MIIBqTCCAVOgAwIBAgIJAJEjvDZ89puoMA0GCSqGSIb3DQEBBQUAMC8xGTAXBgNV
-BAoMEE5vdCBUcnVzdGVkLCBJbmMxEjAQBgNVBAMMCTEyNy4wLjAuMTAgFw0xMjEy
-MTExNjUyMTFaGA8yMjg2MDkyNTE2NTIxMVowLzEZMBcGA1UECgwQTm90IFRydXN0
-ZWQsIEluYzESMBAGA1UEAwwJMTI3LjAuMC4xMFwwDQYJKoZIhvcNAQEBBQADSwAw
-SAJBAMj44RxONUFt8VWGtg0qMvkd8mSJALlWwttMkCvSRG2lTDoNGb2CLNWkY9K1
-DWB6/7sGyOYOiJSyWGkdPh5or00CAwEAAaNQME4wHQYDVR0OBBYEFOtFQ5lE51bn
-w6MmgNZirgHJYihLMB8GA1UdIwQYMBaAFOtFQ5lE51bnw6MmgNZirgHJYihLMAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADQQBQ5U43uyblaqnrtJ/xr6olYqlp
-h3NFjhG1B99Gg5IiI1SghSZH2GXqlzAdTsV7BYEzEvLtXl142QSEWKCvXCAe
+MIICuDCCAnagAwIBAgIEORFSwTALBgcqhkjOOAQDBQAwLjESMBAGA1UEAxMJMTI3
+LjAuMC4xMRgwFgYDVQQKEw9Ob3QgVHJ1c3RlZCBJbmMwHhcNMTIxMjE0MTkyNjE2
+WhcNMTMwMzE0MTkyNjE2WjAuMRIwEAYDVQQDEwkxMjcuMC4wLjExGDAWBgNVBAoT
+D05vdCBUcnVzdGVkIEluYzCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OBHXUS
+KVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2y5tVbNeB
+O4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUPBPuD9tPFHsMC
+NVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvMspK5gqLrhAvwWBz1
+AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlXjrrUWU/mcQcQ
+gYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6jfwv6ITVi8fti
+egEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqA4GEAAKBgFmK1k4m
+fUIkoNBN+RDNupwB23KAY7ndKYSpsRb/1emUmHt95hlW2YVLY2sAxs1L4f/P86Pq
+1VQ1ikoPUQUVG7K2DiGiZ9cBlAlpjT5Tc3UIUy3Pp+dLvsV/XTjlwQtVkeixSglS
+MaGQgsY2cyHNIgfjDI1btWaf59KUT7fghZ6UoyEwHzAdBgNVHQ4EFgQU7W7iB3hz
+3v/ZSNNNc4SUkppnQOYwCwYHKoZIzjgEAwUAAy8AMCwCFH+2yE3PEcoDD+OpLLYZ
+kIUyaKmnAhQFn6PxXYxKNpjKvNBA5YrWPlQRQw==
 -----END CERTIFICATE-----



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org