Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
5af7f926
Commit
5af7f926
authored
1 year ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
fileutils: reuse password salt if possible
Change-Id: Iee22b03bf0b5171ed4dd5b6e8e26fea57e0022bb
parent
60918828
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/fileutils.cpp
+1
-1
1 addition, 1 deletion
src/fileutils.cpp
with
1 addition
and
1 deletion
src/fileutils.cpp
+
1
−
1
View file @
5af7f926
...
...
@@ -400,7 +400,7 @@ writeArchive(const std::string& archive_str,
}
else
if
(
scheme
==
ARCHIVE_AUTH_SCHEME_PASSWORD
and
not
password
.
empty
())
{
// Encrypt using provided password
try
{
saveFile
(
path
,
dht
::
crypto
::
aesEncrypt
(
archiver
::
compress
(
archive_str
),
password
));
saveFile
(
path
,
dht
::
crypto
::
aesEncrypt
(
archiver
::
compress
(
archive_str
),
password
,
password_salt
));
}
catch
(
const
std
::
runtime_error
&
ex
)
{
JAMI_ERROR
(
"Export failed: {}"
,
ex
.
what
());
return
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment