Title: [112104] trunk/Source/WebCore
- Revision
- 112104
- Author
- [email protected]
- Date
- 2012-03-26 08:37:11 -0700 (Mon, 26 Mar 2012)
Log Message
[BlackBerry] CredentialBackingStore implement encryptString() and decryptString()
https://bugs.webkit.org/show_bug.cgi?id=82204
Patch by Jonathan Dong <[email protected]> on 2012-03-26
Reviewed by Rob Buis.
Implemented encryptedString() and decryptedString() in class CredentialBackingStore
by calling BlackBerry::Platform::Encryptor::encryptString() and
BlackBerry::Platform::Encryptor::encryptString() respectively.
No new tests.
* platform/network/blackberry/CredentialBackingStore.cpp:
(WebCore::CredentialBackingStore::encryptedString):
(WebCore::CredentialBackingStore::decryptedString):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112103 => 112104)
--- trunk/Source/WebCore/ChangeLog 2012-03-26 15:36:27 UTC (rev 112103)
+++ trunk/Source/WebCore/ChangeLog 2012-03-26 15:37:11 UTC (rev 112104)
@@ -1,3 +1,20 @@
+2012-03-26 Jonathan Dong <[email protected]>
+
+ [BlackBerry] CredentialBackingStore implement encryptString() and decryptString()
+ https://bugs.webkit.org/show_bug.cgi?id=82204
+
+ Reviewed by Rob Buis.
+
+ Implemented encryptedString() and decryptedString() in class CredentialBackingStore
+ by calling BlackBerry::Platform::Encryptor::encryptString() and
+ BlackBerry::Platform::Encryptor::encryptString() respectively.
+
+ No new tests.
+
+ * platform/network/blackberry/CredentialBackingStore.cpp:
+ (WebCore::CredentialBackingStore::encryptedString):
+ (WebCore::CredentialBackingStore::decryptedString):
+
2012-03-26 Pavel Feldman <[email protected]>
Web Inspector: 'use strict' exceptions stop in inspector code
Modified: trunk/Source/WebCore/platform/network/blackberry/CredentialBackingStore.cpp (112103 => 112104)
--- trunk/Source/WebCore/platform/network/blackberry/CredentialBackingStore.cpp 2012-03-26 15:36:27 UTC (rev 112103)
+++ trunk/Source/WebCore/platform/network/blackberry/CredentialBackingStore.cpp 2012-03-26 15:37:11 UTC (rev 112104)
@@ -28,6 +28,7 @@
#include "ProtectionSpaceHash.h"
#include "SQLiteStatement.h"
#include <BlackBerryPlatformClient.h>
+#include <BlackBerryPlatformEncryptor.h>
#define HANDLE_SQL_EXEC_FAILURE(statement, returnValue, ...) \
if (statement) { \
@@ -423,16 +424,16 @@
String CredentialBackingStore::encryptedString(const String& plainText) const
{
- // FIXME: Need encrypt plainText here
- notImplemented();
- return plainText;
+ std::string cipherText;
+ BlackBerry::Platform::Encryptor::encryptString(std::string(plainText.latin1().data()), &cipherText);
+ return String(cipherText.c_str());
}
String CredentialBackingStore::decryptedString(const String& cipherText) const
{
- // FIXME: Need decrypt cipherText here
- notImplemented();
- return cipherText;
+ std::string plainText;
+ BlackBerry::Platform::Encryptor::decryptString(std::string(cipherText.latin1().data()), &plainText);
+ return String(plainText.c_str());
}
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes