Merge lp:~zorba-coders/zorba/new-base64-api into lp:zorba/security-module

[Paul J. Lucas]

Corresponding changes for new Base64 public API.

Corresponding changes for new Base64 public API.

[lp:~zorba-coders/zorba/new-base64-api]

31. By Paul J. Lucas on 2013-07-30

Fix.

32. By Paul J. Lucas on 2013-07-30

Fix.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== 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:49:28 +0000
@@ -125,9 +125,9 @@
           const char* lTmp = aMessage.getBase64BinaryValue(lLen);
           if (aDecode)
           {
-            String lTmpEncoded(lTmp, lLen);
+            String lTmpEncoded;
             // lTmpDecodedBuf is used to make sure lMsg is still alive during HMAC_Update
-            lTmpDecodedBuf = base64::decode(lTmpEncoded);
+            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:49:28 +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();
     }