added error checking to compact() and support encryption on Linux #832
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
finnschiermer
changed the title
| @@ -73,10 +73,17 @@ AESCryptor::AESCryptor(const uint8_t* key) { | |||
| CCCryptorCreate(kCCEncrypt, kCCAlgorithmAES, 0 /* options */, key, kCCKeySizeAES256, 0 /* IV */, &m_encr); | |||
| CCCryptorCreate(kCCDecrypt, kCCAlgorithmAES, 0 /* options */, key, kCCKeySizeAES256, 0 /* IV */, &m_decr); | |||
| #else | |||
| #ifdef REALM_ANDROID | |||
|
|
|||
| #if defined(REALM_ANDROID) || defined(__linux__) | |||
There was a problem hiding this comment.
I am pretty sure __linux__ is defined on Android, so #ifdef __linux__ would suffice here.
|
👍 |
finnschiermer
added a commit
that referenced
this pull request
May 29, 2015
added error checking to compact() and support encryption on Linux
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes the description of SharedGroup::compact more precise and checks that the SharedGroup is attached when compact is called.
It also allows encryption to be enabled on Linux.
All core unittests now pass with encryption enabled on Linux.