Skip to content

Commit

Permalink
CBL-4348 : Tag prop encryptor and decryptor as nullable (#485)
Browse files Browse the repository at this point in the history
Tagged propertyEncryptor, propertyDecryptor, documentPropertyEncryptor, and documentPropertyDecryptor as nullable. They are optional.

Ported from baad2f1 in branch release/3.1.
  • Loading branch information
pasin authored May 23, 2023
1 parent 267834a commit 9971bc4
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions include/cbl/CBLReplicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -411,15 +411,18 @@ typedef struct {
/** Optional callback to encrypt \ref CBLEncryptable values of the documents in the default collection.
@note This property can only be used when setting the config object with the database instead of collections.
@warning <b>Deprecated :</b> Use documentPropertyEncryptor instead. */
CBLPropertyEncryptor propertyEncryptor;
CBLPropertyEncryptor _cbl_nullable propertyEncryptor;

/** Optional callback to decrypt encrypted \ref CBLEncryptable values of the documents in the default collection.
@note This property can only be used when setting the config object with the database instead of collections.
@warning <b>Deprecated :</b> Use documentPropertyDecryptor instead. */
CBLPropertyDecryptor propertyDecryptor;
CBLPropertyDecryptor _cbl_nullable propertyDecryptor;

CBLDocumentPropertyEncryptor documentPropertyEncryptor; ///< Optional callback to encrypt \ref CBLEncryptable values.
CBLDocumentPropertyDecryptor documentPropertyDecryptor; ///< Optional callback to decrypt encrypted \ref CBLEncryptable values.
/** Optional callback to encrypt \ref CBLEncryptable values. */
CBLDocumentPropertyEncryptor _cbl_nullable documentPropertyEncryptor;

/** Optional callback to decrypt encrypted \ref CBLEncryptable values. */
CBLDocumentPropertyDecryptor _cbl_nullable documentPropertyDecryptor;
#endif

/** The collections to replicate with the target's endpoint (Required if the database is not set). */
Expand Down

0 comments on commit 9971bc4

Please sign in to comment.