Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-06-02 12:32:30 +0300
committerStan Hu <stanhu@gmail.com>2018-06-02 15:24:59 +0300
commit61df812ac688cb0848752f9f26f77d65eadf160a (patch)
tree62306bb84db245047963109401a3202010711f3d /changelogs
parentfe0ebf76c49e2512b211c5d43152275c536f7e3a (diff)
Fix attr_encryption key settings
attr_encrypted does different things with `key` depending on what mode you are using: 1. In `:per_attribute_iv_and_salt` mode, it generates a hash with the salt: https://github.com/attr-encrypted/encryptor/blob/c3a62c4a9e74686dd95e0548f9dc2a361fdc95d1/lib/encryptor.rb#L77. There is no need to truncate the key to 32 bytes here. 2. In `:per_attribute_iv` mode, it sets the key directly to the password, so truncation to 32 bytes is necessary. Closes #47166
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-secrets-not-working.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-secrets-not-working.yml b/changelogs/unreleased/sh-fix-secrets-not-working.yml
new file mode 100644
index 00000000000..044a873ecd9
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-secrets-not-working.yml
@@ -0,0 +1,5 @@
+---
+title: Fix attr_encryption key settings
+merge_request:
+author:
+type: fixed