[XrdCl] Fix: make sure signature is not reused for subsequent request.

xrootd · Oct 26, 2016 · 97f899a · 97f899a
1 parent 4747529
commit 97f899a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/XrdCl/XrdClAsyncSocketHandler.cc b/src/XrdCl/XrdClAsyncSocketHandler.cc
@@ -378,6 +378,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       // Secure the message if necessary
       //------------------------------------------------------------------------
+      delete pSignature; pSignature = 0;
       XRootDStatus st = GetSignature( pOutgoing, pSignature );
       if( !st.IsOK() )
       {
@@ -521,7 +522,7 @@ namespace XrdCl
   //----------------------------------------------------------------------------
   // Write the message and its signature
   //----------------------------------------------------------------------------
-  Status AsyncSocketHandler::WriteSignedMessage( Message *toWrite, Message *sign )
+  Status AsyncSocketHandler::WriteSignedMessage( Message *toWrite, Message *&sign )
   {
     if( !sign ) return WriteCurrentMessage( toWrite );
 

diff --git a/src/XrdCl/XrdClAsyncSocketHandler.hh b/src/XrdCl/XrdClAsyncSocketHandler.hh
@@ -149,7 +149,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       // Write the message and its signature
       //------------------------------------------------------------------------
-      Status WriteSignedMessage( Message *toWrite, Message *sign );
+      Status WriteSignedMessage( Message *toWrite, Message *&sign );
 
       //------------------------------------------------------------------------
       // Got a read readiness event

diff --git a/src/XrdCl/XrdClXRootDTransport.cc b/src/XrdCl/XrdClXRootDTransport.cc
@@ -1206,15 +1206,6 @@ namespace XrdCl
     if( pSecUnloadHandler->unloaded ) return Status( stError, errInvalidOp );
 
     ClientRequest *thereq  = reinterpret_cast<ClientRequest*>( toSign->GetBuffer() );
-    if( sign )
-    {
-      SecurityRequest *sec = reinterpret_cast<SecurityRequest*>( sign->GetBuffer() );
-      kXR_unt16 reqid = ntohs( thereq->header.requestid );
-      kXR_unt16 expid = ntohs( sec->sigver.expectrid );
-      if( expid == reqid ) return Status(); // it's the correct signature for the request
-      delete sign; sign = 0; // otherwise delete the signature
-    }
-
     XRootDChannelInfo *info = 0;
     channelData.Get( info );
     if( !info ) return Status( stError, errInternal );