Unreviewed build fix after r218484.
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Jun 2017 12:03:45 +0000 (12:03 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 19 Jun 2017 12:03:45 +0000 (12:03 +0000)
Source/WebCore:

Properly access the GCryptCipherOperation type (now CipherOperation)
in the PAL::GCrypt namespace. This somehow worked in local builds.

* crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp:
(WebCore::callOperation):
(WebCore::gcryptAES_CTR):

Source/WebCore/PAL:

* pal/crypto/gcrypt/Utilities.h: Drop the GCrypt prefix from the
GCryptCipherOperation type definition, since it's already nested
in the PAL::GCrypt namespace.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/crypto/gcrypt/Utilities.h
Source/WebCore/crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp

index 391ff27..6ddb730 100644 (file)
@@ -1,5 +1,16 @@
 2017-06-19  Zan Dobersek  <zdobersek@igalia.com>
 
+        Unreviewed build fix after r218484.
+
+        Properly access the GCryptCipherOperation type (now CipherOperation)
+        in the PAL::GCrypt namespace. This somehow worked in local builds.
+
+        * crypto/gcrypt/CryptoAlgorithmAES_CTRGCrypt.cpp:
+        (WebCore::callOperation):
+        (WebCore::gcryptAES_CTR):
+
+2017-06-19  Zan Dobersek  <zdobersek@igalia.com>
+
         [GCrypt] AES_CTR support
         https://bugs.webkit.org/show_bug.cgi?id=171420
 
index d74f32a..858e4fe 100644 (file)
@@ -1,5 +1,13 @@
 2017-06-19  Zan Dobersek  <zdobersek@igalia.com>
 
+        Unreviewed build fix after r218484.
+
+        * pal/crypto/gcrypt/Utilities.h: Drop the GCrypt prefix from the
+        GCryptCipherOperation type definition, since it's already nested
+        in the PAL::GCrypt namespace.
+
+2017-06-19  Zan Dobersek  <zdobersek@igalia.com>
+
         [GCrypt] AES_CTR support
         https://bugs.webkit.org/show_bug.cgi?id=171420
 
index 14608ff..a78848e 100644 (file)
@@ -39,7 +39,7 @@ namespace GCrypt {
             gcry_cipher_ctl ((a), GCRYCTL_FINALIZE, NULL, 0)
 #endif
 
-using GCryptCipherOperation = gcry_error_t(gcry_cipher_hd_t, void*, size_t, const void*, size_t);
+using CipherOperation = gcry_error_t(gcry_cipher_hd_t, void*, size_t, const void*, size_t);
 
 static inline void logError(gcry_error_t error)
 {
index 89749e1..6dcf79a 100644 (file)
@@ -41,7 +41,7 @@ namespace WebCore {
 
 // This is a helper function that resets the cipher object, sets the provided counter data,
 // and executes the encrypt or decrypt operation, retrieving and returning the output data.
-static std::optional<Vector<uint8_t>> callOperation(GCryptCipherOperation operation, gcry_cipher_hd_t handle, const Vector<uint8_t>& counter, const uint8_t* data, const size_t size)
+static std::optional<Vector<uint8_t>> callOperation(PAL::GCrypt::CipherOperation operation, gcry_cipher_hd_t handle, const Vector<uint8_t>& counter, const uint8_t* data, const size_t size)
 {
     gcry_error_t error = gcry_cipher_reset(handle);
     if (error != GPG_ERR_NO_ERROR) {
@@ -71,7 +71,7 @@ static std::optional<Vector<uint8_t>> callOperation(GCryptCipherOperation operat
     return output;
 }
 
-static std::optional<Vector<uint8_t>> gcryptAES_CTR(GCryptCipherOperation operation, const Vector<uint8_t>& key, const Vector<uint8_t>& counter, size_t counterLength, const Vector<uint8_t>& inputText)
+static std::optional<Vector<uint8_t>> gcryptAES_CTR(PAL::GCrypt::CipherOperation operation, const Vector<uint8_t>& key, const Vector<uint8_t>& counter, size_t counterLength, const Vector<uint8_t>& inputText)
 {
     constexpr size_t blockSize = 16;
     auto algorithm = PAL::GCrypt::aesAlgorithmForKeySize(key.size() * 8);