Merge branch '3.3-wlad-schannel' into 3.3

Author: vaintroub

libmariadb/secure/ma_schannel.c

@@ -100,6 +100,13 @@ SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRe
     return SEC_E_INSUFFICIENT_MEMORY;
 
   cbIoBuffer = 0;
+
+  if (!InitialRead && pExtraData->cbBuffer)
+  {
+    memcpy(IoBuffer, pExtraData->pvBuffer,pExtraData->cbBuffer);
+    cbIoBuffer= pExtraData->cbBuffer;
+  }
+
   fDoRead = InitialRead;
 
   /* handshake loop: We will leave if handshake is finished
@@ -445,7 +452,7 @@ SECURITY_STATUS ma_schannel_read_decrypt(MARIADB_PVIO *pvio,
     } while (sRet == SEC_E_INCOMPLETE_MESSAGE); /* Continue reading until full message arrives */
 
 
-    if (sRet != SEC_E_OK)
+    if (sRet != SEC_E_OK && sRet != SEC_I_RENEGOTIATE)
     {
       ma_schannel_set_sec_error(pvio, sRet);
       return sRet;
@@ -462,20 +469,21 @@ SECURITY_STATUS ma_schannel_read_decrypt(MARIADB_PVIO *pvio,
     }
 
 
-    if (sctx->dataBuf.cbBuffer)
+    if (sctx->dataBuf.cbBuffer || sRet == SEC_I_RENEGOTIATE)
     {
       assert(sctx->dataBuf.pvBuffer);
       /*
         Copy at most ReadBufferSize bytes to output.
         Store the rest (if any) to be processed next time.
       */
       nbytes = MIN(sctx->dataBuf.cbBuffer, ReadBufferSize);
-      memcpy((char *)ReadBuffer, sctx->dataBuf.pvBuffer, nbytes);
+      if (nbytes)
+        memcpy((char *)ReadBuffer, sctx->dataBuf.pvBuffer, nbytes);
       sctx->dataBuf.cbBuffer -= (unsigned long)nbytes;
       sctx->dataBuf.pvBuffer = (char *)sctx->dataBuf.pvBuffer + nbytes;
 
       *DecryptLength = (DWORD)nbytes;
-      return SEC_E_OK;
+      return sRet;
     }
     // No data buffer, loop
   }