zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/new-base64-api into lp:zorba/security-module.

Commit message:
Corresponding changes for new Base64 public API.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667

Corresponding changes for new Base64 public API.
-- 
https://code.launchpad.net/~zorba-coders/zorba/new-base64-api/+merge/177667
Your team Zorba Coders is subscribed to branch lp:zorba/security-module.

=== modified file 'src/hash.xq.src/hash.h'
--- src/hash.xq.src/hash.h	2013-06-21 20:55:00 +0000
+++ src/hash.xq.src/hash.h	2013-07-30 18:39:31 +0000
@@ -127,7 +127,7 @@
           {
             String lTmpEncoded(lTmp, lLen);
             // lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
-            lTmpDecodedBuf = base64::decode(lTmpEncoded);
+            lTmpDecodedBuf = base64::decode(lTmp, lLen, &lTmpDecodedBuf);
             lTmp = lTmpDecodedBuf.c_str();
             lLen = lTmpDecodedBuf.size();
           }

=== modified file 'src/hmac.xq.src/hmac.cpp'
--- src/hmac.xq.src/hmac.cpp	2013-06-21 03:04:34 +0000
+++ src/hmac.xq.src/hmac.cpp	2013-07-30 18:39:31 +0000
@@ -218,9 +218,9 @@
     const char* lMsg = lItem.getBase64BinaryValue(lSize);
     if (lItem.isEncoded())
     {
-      String lTmpEncoded(lMsg, lSize);
+      String lTmpEncoded;
       // lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
-      lTmpDecodedBuf = base64::decode(lTmpEncoded);
+      base64::decode(lMsg, lSize, &lTmpDecodedBuf);
       lMsg = lTmpDecodedBuf.c_str();
       lSize = lTmpDecodedBuf.size();
     }