Modified: trunk/Source/WebCore/ChangeLog (215727 => 215728)
--- trunk/Source/WebCore/ChangeLog 2017-04-25 10:48:31 UTC (rev 215727)
+++ trunk/Source/WebCore/ChangeLog 2017-04-25 12:16:46 UTC (rev 215728)
@@ -1,3 +1,15 @@
+2017-04-25 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Build fix
+
+ Unreviewed.
+
+ No new tests because there is no behavior change.
+
+ * crypto/mac/SerializedCryptoKeyWrapMac.mm:
+ (WebCore::wrapSerializedCryptoKey):
+ (WebCore::unwrapSerializedCryptoKey):
+
2017-04-25 Wenson Hsieh <wenson_hs...@apple.com>
Support reading NSURL titles from the pasteboard when performing data interaction
Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (215727 => 215728)
--- trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2017-04-25 10:48:31 UTC (rev 215727)
+++ trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2017-04-25 12:16:46 UTC (rev 215728)
@@ -204,6 +204,8 @@
size_t tagLength = 16;
uint8_t tag[tagLength];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
status = CCCryptorGCM(kCCEncrypt, kCCAlgorithmAES128, kek.data(), kek.size(),
nullptr, 0, // iv
nullptr, 0, // auth data
@@ -210,6 +212,7 @@
key.data(), key.size(),
encryptedKey.data(),
tag, &tagLength);
+#pragma clang diagnostic pop
if (status != kCCSuccess)
return false;
@@ -270,6 +273,8 @@
uint8_t actualTag[tagLength];
key.resize(encryptedKey.size());
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
status = CCCryptorGCM(kCCDecrypt, kCCAlgorithmAES128, kek.data(), kek.size(),
nullptr, 0, // iv
nullptr, 0, // auth data
@@ -276,6 +281,7 @@
encryptedKey.data(), encryptedKey.size(),
key.data(),
actualTag, &tagLength);
+#pragma clang diagnostic pop
if (status != kCCSuccess)
return false;
