Modified: trunk/Source/WebCore/ChangeLog (159950 => 159951)
--- trunk/Source/WebCore/ChangeLog 2013-12-02 20:11:27 UTC (rev 159950)
+++ trunk/Source/WebCore/ChangeLog 2013-12-02 20:28:54 UTC (rev 159951)
@@ -1,3 +1,14 @@
+2013-12-02 Alexey Proskuryakov <[email protected]>
+
+ Add support for WebCrypto RSA-OAEP
+ https://bugs.webkit.org/show_bug.cgi?id=125084
+
+ Build fix.
+
+ * crypto/CommonCryptoUtilities.h:
+ * crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp:
+ * crypto/mac/CryptoKeyRSAMac.cpp:
+
2013-12-02 Brendan Long <[email protected]>
Use GenericEventQueue in TrackListBase and reduce code duplication with scheduleTrackEvent()
Modified: trunk/Source/WebCore/crypto/CommonCryptoUtilities.h (159950 => 159951)
--- trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2013-12-02 20:11:27 UTC (rev 159950)
+++ trunk/Source/WebCore/crypto/CommonCryptoUtilities.h 2013-12-02 20:28:54 UTC (rev 159951)
@@ -30,6 +30,8 @@
#include "CryptoAlgorithmIdentifier.h"
+#include <CommonCrypto/CommonCryptor.h>
+
#if defined(__has_include)
#if __has_include(<CommonCrypto/CommonRSACryptor.h>)
#include <CommonCrypto/CommonRSACryptor.h>
@@ -73,6 +75,7 @@
extern const CCRandomRef kCCRandomDefault;
extern "C" int CCRandomCopyBytes(CCRandomRef rnd, void *bytes, size_t count);
+typedef struct _CCRSACryptor *CCRSACryptorRef;
extern "C" CCCryptorStatus CCRSACryptorEncrypt(CCRSACryptorRef publicKey, CCAsymmetricPadding padding, const void *plainText, size_t plainTextLen, void *cipherText, size_t *cipherTextLen, const void *tagData, size_t tagDataLen, CCDigestAlgorithm digestType);
extern "C" CCCryptorStatus CCRSACryptorDecrypt(CCRSACryptorRef privateKey, CCAsymmetricPadding padding, const void *cipherText, size_t cipherTextLen, void *plainText, size_t *plainTextLen, const void *tagData, size_t tagDataLen, CCDigestAlgorithm digestType);
extern "C" CCCryptorStatus CCRSACryptorSign(CCRSACryptorRef privateKey, CCAsymmetricPadding padding, const void *hashToSign, size_t hashSignLen, CCDigestAlgorithm digestType, size_t saltLen, void *signedData, size_t *signedDataLen);
Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp (159950 => 159951)
--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp 2013-12-02 20:11:27 UTC (rev 159950)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmRSASSA_PKCS1_v1_5Mac.cpp 2013-12-02 20:28:54 UTC (rev 159951)
@@ -33,7 +33,6 @@
#include "CryptoDigest.h"
#include "CryptoKeyRSA.h"
#include "ExceptionCode.h"
-#include <CommonCrypto/CommonCryptor.h>
namespace WebCore {
Modified: trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp (159950 => 159951)
--- trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2013-12-02 20:11:27 UTC (rev 159950)
+++ trunk/Source/WebCore/crypto/mac/CryptoKeyRSAMac.cpp 2013-12-02 20:28:54 UTC (rev 159951)
@@ -33,7 +33,6 @@
#include "CryptoAlgorithmRegistry.h"
#include "CryptoKeyDataRSAComponents.h"
#include "CryptoKeyPair.h"
-#include <CommonCrypto/CommonCryptor.h>
namespace WebCore {