Modified: trunk/Source/WebCore/ChangeLog (215708 => 215709)
--- trunk/Source/WebCore/ChangeLog 2017-04-25 00:30:31 UTC (rev 215708)
+++ trunk/Source/WebCore/ChangeLog 2017-04-25 00:43:36 UTC (rev 215709)
@@ -1,3 +1,11 @@
+2017-04-24 Ryan Haddad <[email protected]>
+
+ Unreviewed build fix.
+
+ * crypto/mac/CryptoAlgorithmAES_GCMMac.cpp:
+ (WebCore::encryptAES_GCM):
+ (WebCore::decyptAES_GCM):
+
2017-04-24 Said Abou-Hallawa <[email protected]>
Whitelist supported image MIME types
Modified: trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp (215708 => 215709)
--- trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp 2017-04-25 00:30:31 UTC (rev 215708)
+++ trunk/Source/WebCore/crypto/mac/CryptoAlgorithmAES_GCMMac.cpp 2017-04-25 00:43:36 UTC (rev 215709)
@@ -42,7 +42,10 @@
Vector<uint8_t> cipherText(plainText.size()); // Per section 5.2.1.2: http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
Vector<uint8_t> tag(desiredTagLengthInBytes);
// tagLength is actual an input <rdar://problem/30660074>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CCCryptorStatus status = CCCryptorGCM(kCCEncrypt, kCCAlgorithmAES, key.data(), key.size(), iv.data(), iv.size(), additionalData.data(), additionalData.size(), plainText.data(), plainText.size(), cipherText.data(), tag.data(), &desiredTagLengthInBytes);
+#pragma clang diagnostic pop
if (status)
return Exception { OperationError };
@@ -57,7 +60,10 @@
Vector<uint8_t> tag(desiredTagLengthInBytes);
size_t offset = cipherText.size() - desiredTagLengthInBytes;
// tagLength is actual an input <rdar://problem/30660074>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
CCCryptorStatus status = CCCryptorGCM(kCCDecrypt, kCCAlgorithmAES, key.data(), key.size(), iv.data(), iv.size(), additionalData.data(), additionalData.size(), cipherText.data(), offset, plainText.data(), tag.data(), &desiredTagLengthInBytes);
+#pragma clang diagnostic pop
if (status)
return Exception { OperationError };
