Skip to content

Commit

Permalink
Merge pull request #11811 from jamesreprise/doc-aes-128-gcm->aes-256-gcm
Browse files Browse the repository at this point in the history
Update documentation to reflect upgrading from AES-128 GCM to AES-256 GCM
  • Loading branch information
jzhou77 authored Nov 28, 2024
2 parents 110827e + 57de8b0 commit cf0a2a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fdbbackup/backup.actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ static void printBackupUsage(bool devhelp) {
" This option indicates to the backup agent that it will only need to record the log files, "
"and ignore the range files.\n");
printf(" --encryption-key-file"
" The AES-128-GCM key in the provided file is used for encrypting backup files.\n");
" The AES-256-GCM key in the provided file is used for encrypting backup files.\n");
printf(" --encrypt-files 0/1"
" If passed, this argument will allow the user to override the database encryption state to "
"either enable (1) or disable (0) encryption at rest with snapshot backups. This option refers to block "
Expand Down Expand Up @@ -1216,7 +1216,7 @@ static void printRestoreUsage(bool devhelp) {
" Indicates to the backup agent to only begin replaying log files from a certain version, "
"instead of the entire set.\n");
printf(" --encryption-key-file"
" The AES-128-GCM key in the provided file is used for decrypting backup files.\n");
" The AES-256-GCM key in the provided file is used for decrypting backup files.\n");
printf(" --blob-manifest-url URL\n"
" Restore from blob granules. Manifest files are stored to the destination URL.\n");
printf(TLS_HELP);
Expand Down
2 changes: 1 addition & 1 deletion fdbrpc/include/fdbrpc/AsyncFileEncrypted.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <array>

/*
* Append-only file encrypted using AES-128-GCM.
* Append-only file encrypted using AES-256-GCM.
* */
class AsyncFileEncrypted : public IAsyncFile, public ReferenceCounted<AsyncFileEncrypted> {
public:
Expand Down
2 changes: 1 addition & 1 deletion flow/include/flow/IAsyncFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class IAsyncFile {
OPEN_NO_AIO =
0x200000, // Don't use AsyncFileKAIO or similar implementations that rely on filesystem support for AIO
OPEN_CACHED_READ_ONLY = 0x400000, // AsyncFileCached opens files read/write even if you specify read only
OPEN_ENCRYPTED = 0x800000 // File is encrypted using AES-128-GCM (must be either read-only or write-only)
OPEN_ENCRYPTED = 0x800000 // File is encrypted using AES-256-GCM (must be either read-only or write-only)
};

virtual void addref() = 0;
Expand Down

0 comments on commit cf0a2a8

Please sign in to comment.