Title: [214325] tags/Safari-604.1.14/Source/WebCore
Revision
214325
Author
jmarc...@apple.com
Date
2017-03-23 16:30:04 -0700 (Thu, 23 Mar 2017)

Log Message

Merge r214310. rdar://problem/31225378

Modified Paths

Diff

Modified: tags/Safari-604.1.14/Source/WebCore/ChangeLog (214324 => 214325)


--- tags/Safari-604.1.14/Source/WebCore/ChangeLog	2017-03-23 23:14:02 UTC (rev 214324)
+++ tags/Safari-604.1.14/Source/WebCore/ChangeLog	2017-03-23 23:30:04 UTC (rev 214325)
@@ -1,3 +1,14 @@
+2017-03-23  Jason Marcell  <jmarc...@apple.com>
+
+        Merge r214310. rdar://problem/31225378
+
+    2017-03-23  Jiewen Tan  <jiewen_...@apple.com>
+
+            Unreviewed, a speculative build fix
+            <rdar://problem/31225378>
+
+            * crypto/CommonCryptoUtilities.h:
+
 2017-03-22  Andreas Kling  <akl...@apple.com>
 
         Let MemoryPressureHandler track whether the process is active or inactive.

Modified: tags/Safari-604.1.14/Source/WebCore/crypto/CommonCryptoUtilities.h (214324 => 214325)


--- tags/Safari-604.1.14/Source/WebCore/crypto/CommonCryptoUtilities.h	2017-03-23 23:14:02 UTC (rev 214324)
+++ tags/Safari-604.1.14/Source/WebCore/crypto/CommonCryptoUtilities.h	2017-03-23 23:30:04 UTC (rev 214325)
@@ -77,7 +77,6 @@
 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);
 extern "C" CCCryptorStatus CCRSACryptorVerify(CCRSACryptorRef publicKey, CCAsymmetricPadding padding, const void *hash, size_t hashLen, CCDigestAlgorithm digestType, size_t saltLen, const void *signedData, size_t signedDataLen);
-extern "C" CCCryptorStatus CCRSACryptorCreateFromData(CCRSAKeyType keyType, uint8_t *modulus, size_t modulusLength, uint8_t *exponent, size_t exponentLength, uint8_t *p, size_t pLength, uint8_t *q, size_t qLength, CCRSACryptorRef *ref);
 extern "C" CCCryptorStatus CCRSACryptorGeneratePair(size_t keysize, uint32_t e, CCRSACryptorRef *publicKey, CCRSACryptorRef *privateKey);
 extern "C" CCRSACryptorRef CCRSACryptorGetPublicKeyFromPrivateKey(CCRSACryptorRef privkey);
 extern "C" void CCRSACryptorRelease(CCRSACryptorRef key);
@@ -111,6 +110,7 @@
 
 #if !USE(APPLE_INTERNAL_SDK)
 extern "C" CCCryptorStatus CCCryptorGCM(CCOperation op, CCAlgorithm alg, const void* key, size_t keyLength, const void* iv, size_t ivLen, const void* aData, size_t aDataLen, const void* dataIn, size_t dataInLength, void* dataOut, void* tag, size_t* tagLength);
+extern "C" CCCryptorStatus CCRSACryptorCreateFromData(CCRSAKeyType keyType, const uint8_t *modulus, size_t modulusLength, const uint8_t *exponent, size_t exponentLength, const uint8_t *p, size_t pLength, const uint8_t *q, size_t qLength, CCRSACryptorRef *ref);
 #endif
 
 namespace WebCore {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to