You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mi...@apache.org on 2005/03/11 09:10:01 UTC

cvs commit: xml-security/c/src/enc/XSCrypt XSCryptCryptoBase64.cpp

milan       2005/03/11 00:10:00

  Modified:    c/src/enc/XSCrypt XSCryptCryptoBase64.cpp
  Log:
  Bug in encode() fixed.
  
  Revision  Changes    Path
  1.6       +5 -3      xml-security/c/src/enc/XSCrypt/XSCryptCryptoBase64.cpp
  
  Index: XSCryptCryptoBase64.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSCrypt/XSCryptCryptoBase64.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSCryptCryptoBase64.cpp	3 Feb 2005 13:21:27 -0000	1.5
  +++ XSCryptCryptoBase64.cpp	11 Mar 2005 08:10:00 -0000	1.6
  @@ -320,11 +320,13 @@
   		m_outputBuffer[m_remainingOutput++] = Base64LookupTable[t];
   
   		// 2 bits from byte one and 4 from byte 2
  -		t = ((m_inputBuffer[i++] << 4) & 0x30) | (m_inputBuffer[i] >> 4);
  +		t = ((m_inputBuffer[i++] << 4) & 0x30);
  +		t |= (m_inputBuffer[i] >> 4);
   		m_outputBuffer[m_remainingOutput++] = Base64LookupTable[t];
   
   		// 4 from byte 2 and 2 from byte 3
  -		t = ((m_inputBuffer[i++] << 2) & 0x3C) | (m_inputBuffer[i] >> 6);
  +		t = ((m_inputBuffer[i++] << 2) & 0x3C);
  +		t |= (m_inputBuffer[i] >> 6);
   		m_outputBuffer[m_remainingOutput++] = Base64LookupTable[t];
   
   		// last 6 bits from byte 3