Author: hdu
Date: Thu Nov 14 12:31:27 2013
New Revision: 1541889
URL: http://svn.apache.org/r1541889
Log:
#i123685# fix xmlsec initializer list for C++11 compliance
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx?rev=1541889&r1=1541888&r2=1541889&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/nss/ciphercontext.cxx
Thu Nov 14 12:31:27 2013
@@ -38,11 +38,11 @@ uno::Reference< xml::crypto::XCipherCont
xResult->m_pSlot = PK11_GetBestSlot( nNSSCipherID, NULL );
if ( xResult->m_pSlot )
{
- SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ),
aKey.getLength() };
+ SECItem aKeyItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aKey.getConstArray() ) ),
static_cast<unsigned>(aKey.getLength()) };
xResult->m_pSymKey = PK11_ImportSymKey( xResult->m_pSlot,
nNSSCipherID, PK11_OriginDerive, bEncryption ? CKA_ENCRYPT : CKA_DECRYPT,
&aKeyItem, NULL );
if ( xResult->m_pSymKey )
{
- SECItem aIVItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray()
) ), aInitializationVector.getLength() };
+ SECItem aIVItem = { siBuffer, const_cast< unsigned char* >(
reinterpret_cast< const unsigned char* >( aInitializationVector.getConstArray()
) ), static_cast<unsigned>(aInitializationVector.getLength()) };
xResult->m_pSecParam = PK11_ParamFromIV( nNSSCipherID, &aIVItem );
if ( xResult->m_pSecParam )
{
