[couchdb] branch aegis_3.x updated (5e8d178be -> 4db1446bf)

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a change to branch aegis_3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


 discard 5e8d178be revert pbkdf2 import
 discard 873a64b91 key manager abstraction
 discard 0aea72e1f erlfmt
 discard 9cbb77b3f Add key rotation facility
 discard 31781d669 use AES_SIV (RFC 5297) instead of AES Key Wrap
    omit 0320343e1 performance boost and also hides the key from inspection
    omit 45ab534c9 encryption password from config
    omit 9ad380ed0 import https://github.com/whitelynx/erlang-pbkdf2/blob/master/src/pbkdf2.erl
    omit 20de0c858 canary value to detect encryption
    omit 2cf6f9ed9 support unencrypted files
    omit 60032eb4b encrypt the headers too
    omit 18e8f8cdc demonstrate native encryption
     add 4db1446bf Database Encryption Support

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5e8d178be)
            \
             N -- N -- N   refs/heads/aegis_3.x (4db1446bf)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/aegis/src/aegis_key_manager.erl | 17 +++++++++++++++++
 src/couch/src/couch_file.erl        |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)